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 53a87e1..90095a4 100644 (file)
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -1,7 +1,11 @@
+#undef FORCED_FLAG
+#undef FORCED_FLAGLL
 #ifdef FORCE_FLAGS
 #define FORCED_FLAG 1
+#define FORCED_FLAGLL 1LL
 #else
 #define FORCED_FLAG 0
+#define FORCED_FLAGLL 0
 #endif
 
 // acpi abctV abctV
@@ -19,7 +23,7 @@
 
 // arp   vi:nDsdap:A:H:[+Ap][!sd]
 #undef OPTSTR_arp
-#define OPTSTR_arp  0 
+#define OPTSTR_arp "vi:nDsdap:A:H:[+Ap][!sd]"
 #ifdef CLEANUP_arp
 #undef CLEANUP_arp
 #undef FOR_arp
@@ -37,7 +41,7 @@
 
 // arping   <1>1s:I:w#<0c#<0AUDbqf[+AU][+Df]
 #undef OPTSTR_arping
-#define OPTSTR_arping  0 
+#define OPTSTR_arping "<1>1s:I:w#<0c#<0AUDbqf[+AU][+Df]"
 #ifdef CLEANUP_arping
 #undef CLEANUP_arping
 #undef FOR_arping
@@ -53,9 +57,9 @@
 #undef FLAG_s
 #endif
 
-// base64 diw#<1[!dw] diw#<1[!dw]
+// base64 diw#<0=76[!dw] diw#<0=76[!dw]
 #undef OPTSTR_base64
-#define OPTSTR_base64 "diw#<1[!dw]"
+#define OPTSTR_base64 "diw#<0=76[!dw]"
 #ifdef CLEANUP_base64
 #undef CLEANUP_base64
 #undef FOR_base64
@@ -74,7 +78,7 @@
 
 // blkid    
 #undef OPTSTR_blkid
-#define OPTSTR_blkid  0 
+#define OPTSTR_blkid " "
 #ifdef CLEANUP_blkid
 #undef CLEANUP_blkid
 #undef FOR_blkid
@@ -101,7 +105,7 @@
 
 // bootchartd    
 #undef OPTSTR_bootchartd
-#define OPTSTR_bootchartd  0 
+#define OPTSTR_bootchartd " "
 #ifdef CLEANUP_bootchartd
 #undef CLEANUP_bootchartd
 #undef FOR_bootchartd
@@ -109,7 +113,7 @@
 
 // brctl   <1
 #undef OPTSTR_brctl
-#define OPTSTR_brctl  0 
+#define OPTSTR_brctl "<1"
 #ifdef CLEANUP_brctl
 #undef CLEANUP_brctl
 #undef FOR_brctl
@@ -130,7 +134,7 @@
 
 // bzcat    
 #undef OPTSTR_bzcat
-#define OPTSTR_bzcat  0 
+#define OPTSTR_bzcat " "
 #ifdef CLEANUP_bzcat
 #undef CLEANUP_bzcat
 #undef FOR_bzcat
@@ -158,7 +162,7 @@
 
 // catv   vte
 #undef OPTSTR_catv
-#define OPTSTR_catv  0 
+#define OPTSTR_catv "vte"
 #ifdef CLEANUP_catv
 #undef CLEANUP_catv
 #undef FOR_catv
@@ -169,7 +173,7 @@
 
 // cd    
 #undef OPTSTR_cd
-#define OPTSTR_cd  0 
+#define OPTSTR_cd " "
 #ifdef CLEANUP_cd
 #undef CLEANUP_cd
 #undef FOR_cd
@@ -177,7 +181,7 @@
 
 // chattr    
 #undef OPTSTR_chattr
-#define OPTSTR_chattr  0 
+#define OPTSTR_chattr " "
 #ifdef CLEANUP_chattr
 #undef CLEANUP_chattr
 #undef FOR_chattr
@@ -230,7 +234,7 @@
 
 // chvt   <1
 #undef OPTSTR_chvt
-#define OPTSTR_chvt  0 
+#define OPTSTR_chvt "<1"
 #ifdef CLEANUP_chvt
 #undef CLEANUP_chvt
 #undef FOR_chvt
@@ -251,15 +255,15 @@
 
 // clear    
 #undef OPTSTR_clear
-#define OPTSTR_clear  0 
+#define OPTSTR_clear " "
 #ifdef CLEANUP_clear
 #undef CLEANUP_clear
 #undef FOR_clear
 #endif
 
-// cmp <2>2ls <2>2ls
+// cmp <2>2ls[!ls] <2>2ls[!ls]
 #undef OPTSTR_cmp
-#define OPTSTR_cmp "<2>2ls"
+#define OPTSTR_cmp "<2>2ls[!ls]"
 #ifdef CLEANUP_cmp
 #undef CLEANUP_cmp
 #undef FOR_cmp
@@ -280,7 +284,7 @@
 
 // compress   zcd9lrg[-cd][!zgLr]
 #undef OPTSTR_compress
-#define OPTSTR_compress  0 
+#define OPTSTR_compress "zcd9lrg[-cd][!zgLr]"
 #ifdef CLEANUP_compress
 #undef CLEANUP_compress
 #undef FOR_compress
@@ -295,7 +299,7 @@
 
 // count    
 #undef OPTSTR_count
-#define OPTSTR_count  0 
+#define OPTSTR_count " "
 #ifdef CLEANUP_count
 #undef CLEANUP_count
 #undef FOR_count
@@ -326,9 +330,9 @@
 #undef FLAG_preserve
 #endif
 
-// cpio mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF] mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF]
+// 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]
 #undef OPTSTR_cpio
-#define OPTSTR_cpio "mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF]"
+#define OPTSTR_cpio "(no-preserve-owner)mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF]"
 #ifdef CLEANUP_cpio
 #undef CLEANUP_cpio
 #undef FOR_cpio
@@ -343,11 +347,12 @@
 #undef FLAG_u
 #undef FLAG_d
 #undef FLAG_m
+#undef FLAG_no_preserve_owner
 #endif
 
 // crond   fbSl#<0=8d#<0L:c:[-bf][-LS][-ld]
 #undef OPTSTR_crond
-#define OPTSTR_crond  0 
+#define OPTSTR_crond "fbSl#<0=8d#<0L:c:[-bf][-LS][-ld]"
 #ifdef CLEANUP_crond
 #undef CLEANUP_crond
 #undef FOR_crond
@@ -362,7 +367,7 @@
 
 // crontab   c:u:elr[!elr]
 #undef OPTSTR_crontab
-#define OPTSTR_crontab  0 
+#define OPTSTR_crontab "c:u:elr[!elr]"
 #ifdef CLEANUP_crontab
 #undef CLEANUP_crontab
 #undef FOR_crontab
@@ -401,7 +406,7 @@
 
 // dd    
 #undef OPTSTR_dd
-#define OPTSTR_dd  0 
+#define OPTSTR_dd " "
 #ifdef CLEANUP_dd
 #undef CLEANUP_dd
 #undef FOR_dd
@@ -409,7 +414,7 @@
 
 // deallocvt   >1
 #undef OPTSTR_deallocvt
-#define OPTSTR_deallocvt  0 
+#define OPTSTR_deallocvt ">1"
 #ifdef CLEANUP_deallocvt
 #undef CLEANUP_deallocvt
 #undef FOR_deallocvt
@@ -429,9 +434,9 @@
 #undef FLAG_H
 #endif
 
-// dhcp   V:H:F:x*r:O*A#<0T#<0t#<0s:p:i:SBRCaovqnbf
+// dhcp   V:H:F:x*r:O*A#<0=20T#<0=3t#<0=3s:p:i:SBRCaovqnbf
 #undef OPTSTR_dhcp
-#define OPTSTR_dhcp  0 
+#define OPTSTR_dhcp "V:H:F:x*r:O*A#<0=20T#<0=3t#<0=3s:p:i:SBRCaovqnbf"
 #ifdef CLEANUP_dhcp
 #undef CLEANUP_dhcp
 #undef FOR_dhcp
@@ -460,9 +465,31 @@
 #undef FLAG_V
 #endif
 
+// dhcp6   r:A#<0T#<0t#<0s:p:i:SRvqnbf
+#undef OPTSTR_dhcp6
+#define OPTSTR_dhcp6 "r:A#<0T#<0t#<0s:p:i:SRvqnbf"
+#ifdef CLEANUP_dhcp6
+#undef CLEANUP_dhcp6
+#undef FOR_dhcp6
+#undef FLAG_f
+#undef FLAG_b
+#undef FLAG_n
+#undef FLAG_q
+#undef FLAG_v
+#undef FLAG_R
+#undef FLAG_S
+#undef FLAG_i
+#undef FLAG_p
+#undef FLAG_s
+#undef FLAG_t
+#undef FLAG_T
+#undef FLAG_A
+#undef FLAG_r
+#endif
+
 // dhcpd   >1P#<0>65535fi:S46[!46]
 #undef OPTSTR_dhcpd
-#define OPTSTR_dhcpd  0 
+#define OPTSTR_dhcpd ">1P#<0>65535fi:S46[!46]"
 #ifdef CLEANUP_dhcpd
 #undef CLEANUP_dhcpd
 #undef FOR_dhcpd
@@ -476,7 +503,7 @@
 
 // diff   <2>2B(ignore-blank-lines)d(minimal)b(ignore-space-change)ut(expand-tabs)w(ignore-all-space)i(ignore-case)T(initial-tab)s(report-identical-files)q(brief)a(text)L(label)*S(starting-file):N(new-file)r(recursive)U(unified)#<0=3
 #undef OPTSTR_diff
-#define OPTSTR_diff  0 
+#define OPTSTR_diff "<2>2B(ignore-blank-lines)d(minimal)b(ignore-space-change)ut(expand-tabs)w(ignore-all-space)i(ignore-case)T(initial-tab)s(report-identical-files)q(brief)a(text)L(label)*S(starting-file):N(new-file)r(recursive)U(unified)#<0=3"
 #ifdef CLEANUP_diff
 #undef CLEANUP_diff
 #undef FOR_diff
@@ -536,7 +563,7 @@
 
 // dos2unix    
 #undef OPTSTR_dos2unix
-#define OPTSTR_dos2unix  0 
+#define OPTSTR_dos2unix " "
 #ifdef CLEANUP_dos2unix
 #undef CLEANUP_dos2unix
 #undef FOR_dos2unix
@@ -564,7 +591,7 @@
 
 // dumpleases   >0arf:[!ar]
 #undef OPTSTR_dumpleases
-#define OPTSTR_dumpleases  0 
+#define OPTSTR_dumpleases ">0arf:[!ar]"
 #ifdef CLEANUP_dumpleases
 #undef CLEANUP_dumpleases
 #undef FOR_dumpleases
@@ -585,7 +612,7 @@
 
 // eject   >1stT[!tT]
 #undef OPTSTR_eject
-#define OPTSTR_eject  0 
+#define OPTSTR_eject ">1stT[!tT]"
 #ifdef CLEANUP_eject
 #undef CLEANUP_eject
 #undef FOR_eject
@@ -594,18 +621,19 @@
 #undef FLAG_s
 #endif
 
-// env ^i ^i
+// env ^iu* ^iu*
 #undef OPTSTR_env
-#define OPTSTR_env "^i"
+#define OPTSTR_env "^iu*"
 #ifdef CLEANUP_env
 #undef CLEANUP_env
 #undef FOR_env
+#undef FLAG_u
 #undef FLAG_i
 #endif
 
 // exit    
 #undef OPTSTR_exit
-#define OPTSTR_exit  0 
+#define OPTSTR_exit " "
 #ifdef CLEANUP_exit
 #undef CLEANUP_exit
 #undef FOR_exit
@@ -622,7 +650,7 @@
 
 // expr    
 #undef OPTSTR_expr
-#define OPTSTR_expr  0 
+#define OPTSTR_expr " "
 #ifdef CLEANUP_expr
 #undef CLEANUP_expr
 #undef FOR_expr
@@ -630,7 +658,7 @@
 
 // factor    
 #undef OPTSTR_factor
-#define OPTSTR_factor  0 
+#define OPTSTR_factor " "
 #ifdef CLEANUP_factor
 #undef CLEANUP_factor
 #undef FOR_factor
@@ -647,7 +675,7 @@
 
 // false    
 #undef OPTSTR_false
-#define OPTSTR_false  0 
+#define OPTSTR_false " "
 #ifdef CLEANUP_false
 #undef CLEANUP_false
 #undef FOR_false
@@ -655,7 +683,7 @@
 
 // fdisk   C#<0H#<0S#<0b#<512ul
 #undef OPTSTR_fdisk
-#define OPTSTR_fdisk  0 
+#define OPTSTR_fdisk "C#<0H#<0S#<0b#<512ul"
 #ifdef CLEANUP_fdisk
 #undef CLEANUP_fdisk
 #undef FOR_fdisk
@@ -667,6 +695,14 @@
 #undef FLAG_C
 #endif
 
+// file <1 <1
+#undef OPTSTR_file
+#define OPTSTR_file "<1"
+#ifdef CLEANUP_file
+#undef CLEANUP_file
+#undef FOR_file
+#endif
+
 // find ?^HL[-HL] ?^HL[-HL]
 #undef OPTSTR_find
 #define OPTSTR_find "?^HL[-HL]"
@@ -691,7 +727,7 @@
 
 // fold   bsuw#<1
 #undef OPTSTR_fold
-#define OPTSTR_fold  0 
+#define OPTSTR_fold "bsuw#<1"
 #ifdef CLEANUP_fold
 #undef CLEANUP_fold
 #undef FOR_fold
@@ -701,9 +737,9 @@
 #undef FLAG_b
 #endif
 
-// free tgmkb[!tgmkb] tgmkb[!tgmkb]
+// free htgmkb[!htgmkb] htgmkb[!htgmkb]
 #undef OPTSTR_free
-#define OPTSTR_free "tgmkb[!tgmkb]"
+#define OPTSTR_free "htgmkb[!htgmkb]"
 #ifdef CLEANUP_free
 #undef CLEANUP_free
 #undef FOR_free
@@ -712,6 +748,7 @@
 #undef FLAG_m
 #undef FLAG_g
 #undef FLAG_t
+#undef FLAG_h
 #endif
 
 // freeramdisk <1>1 <1>1
@@ -724,7 +761,7 @@
 
 // fsck   ?t:ANPRTVsC#
 #undef OPTSTR_fsck
-#define OPTSTR_fsck  0 
+#define OPTSTR_fsck "?t:ANPRTVsC#"
 #ifdef CLEANUP_fsck
 #undef CLEANUP_fsck
 #undef FOR_fsck
@@ -751,7 +788,7 @@
 
 // fstype   <1
 #undef OPTSTR_fstype
-#define OPTSTR_fstype  0 
+#define OPTSTR_fstype "<1"
 #ifdef CLEANUP_fstype
 #undef CLEANUP_fstype
 #undef FOR_fstype
@@ -759,7 +796,7 @@
 
 // fsync   <1d
 #undef OPTSTR_fsync
-#define OPTSTR_fsync  0 
+#define OPTSTR_fsync "<1d"
 #ifdef CLEANUP_fsync
 #undef CLEANUP_fsync
 #undef FOR_fsync
@@ -768,7 +805,7 @@
 
 // ftpget   <2cvu:p:P#<0=21>65535
 #undef OPTSTR_ftpget
-#define OPTSTR_ftpget  0 
+#define OPTSTR_ftpget "<2cvu:p:P#<0=21>65535"
 #ifdef CLEANUP_ftpget
 #undef CLEANUP_ftpget
 #undef FOR_ftpget
@@ -787,17 +824,18 @@
 #undef FOR_getenforce
 #endif
 
-// getprop >2 >2
+// getprop >2Z >2Z
 #undef OPTSTR_getprop
-#define OPTSTR_getprop ">2"
+#define OPTSTR_getprop ">2Z"
 #ifdef CLEANUP_getprop
 #undef CLEANUP_getprop
 #undef FOR_getprop
+#undef FLAG_Z
 #endif
 
 // getty   <2t#<0H:I:l:f:iwnmLh
 #undef OPTSTR_getty
-#define OPTSTR_getty  0 
+#define OPTSTR_getty "<2t#<0H:I:l:f:iwnmLh"
 #ifdef CLEANUP_getty
 #undef CLEANUP_getty
 #undef FOR_getty
@@ -814,9 +852,9 @@
 #undef FLAG_t
 #endif
 
-// grep ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw] ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw]
+// grep C#B#A#ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw] C#B#A#ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw]
 #undef OPTSTR_grep
-#define OPTSTR_grep "ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw]"
+#define OPTSTR_grep "C#B#A#ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw]"
 #ifdef CLEANUP_grep
 #undef CLEANUP_grep
 #undef FOR_grep
@@ -842,11 +880,14 @@
 #undef FLAG_E
 #undef FLAG_z
 #undef FLAG_Z
+#undef FLAG_A
+#undef FLAG_B
+#undef FLAG_C
 #endif
 
 // groupadd   <1>2g#<0S
 #undef OPTSTR_groupadd
-#define OPTSTR_groupadd  0 
+#define OPTSTR_groupadd "<1>2g#<0S"
 #ifdef CLEANUP_groupadd
 #undef CLEANUP_groupadd
 #undef FOR_groupadd
@@ -856,7 +897,7 @@
 
 // groupdel   <1>2
 #undef OPTSTR_groupdel
-#define OPTSTR_groupdel  0 
+#define OPTSTR_groupdel "<1>2"
 #ifdef CLEANUP_groupdel
 #undef CLEANUP_groupdel
 #undef FOR_groupdel
@@ -864,7 +905,7 @@
 
 // groups    
 #undef OPTSTR_groups
-#define OPTSTR_groups  0 
+#define OPTSTR_groups " "
 #ifdef CLEANUP_groups
 #undef CLEANUP_groups
 #undef FOR_groups
@@ -872,7 +913,7 @@
 
 // gunzip   cflqStv
 #undef OPTSTR_gunzip
-#define OPTSTR_gunzip  0 
+#define OPTSTR_gunzip "cflqStv"
 #ifdef CLEANUP_gunzip
 #undef CLEANUP_gunzip
 #undef FOR_gunzip
@@ -887,7 +928,7 @@
 
 // gzip   d19dcflqStvgLRz[!gLRz]
 #undef OPTSTR_gzip
-#define OPTSTR_gzip  0 
+#define OPTSTR_gzip "d19dcflqStvgLRz[!gLRz]"
 #ifdef CLEANUP_gzip
 #undef CLEANUP_gzip
 #undef FOR_gzip
@@ -919,7 +960,7 @@
 
 // hello    
 #undef OPTSTR_hello
-#define OPTSTR_hello  0 
+#define OPTSTR_hello " "
 #ifdef CLEANUP_hello
 #undef CLEANUP_hello
 #undef FOR_hello
@@ -937,7 +978,7 @@
 
 // hexedit   <1>1r
 #undef OPTSTR_hexedit
-#define OPTSTR_hexedit  0 
+#define OPTSTR_hexedit "<1>1r"
 #ifdef CLEANUP_hexedit
 #undef CLEANUP_hexedit
 #undef FOR_hexedit
@@ -946,7 +987,7 @@
 
 // host   <1>2avt:
 #undef OPTSTR_host
-#define OPTSTR_host  0 
+#define OPTSTR_host "<1>2avt:"
 #ifdef CLEANUP_host
 #undef CLEANUP_host
 #undef FOR_host
@@ -957,18 +998,20 @@
 
 // hostid   >0
 #undef OPTSTR_hostid
-#define OPTSTR_hostid  0 
+#define OPTSTR_hostid ">0"
 #ifdef CLEANUP_hostid
 #undef CLEANUP_hostid
 #undef FOR_hostid
 #endif
 
-// hostname    
+// hostname bF: bF:
 #undef OPTSTR_hostname
-#define OPTSTR_hostname  0 
+#define OPTSTR_hostname "bF:"
 #ifdef CLEANUP_hostname
 #undef CLEANUP_hostname
 #undef FOR_hostname
+#undef FLAG_F
+#undef FLAG_b
 #endif
 
 // hwclock >0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw] >0(fast)f(rtc):u(utc)l(localtime)t(systz)s(hctosys)r(show)w(systohc)[-ul][!rtsw]
@@ -996,7 +1039,7 @@
 
 // iconv   cst:f:
 #undef OPTSTR_iconv
-#define OPTSTR_iconv  0 
+#define OPTSTR_iconv "cst:f:"
 #ifdef CLEANUP_iconv
 #undef CLEANUP_iconv
 #undef FOR_iconv
@@ -1031,7 +1074,7 @@
 
 // init    
 #undef OPTSTR_init
-#define OPTSTR_init  0 
+#define OPTSTR_init " "
 #ifdef CLEANUP_init
 #undef CLEANUP_init
 #undef FOR_init
@@ -1090,9 +1133,30 @@
 #undef FOR_iorenice
 #endif
 
+// iotop   >0AaKOk*o*p*u*s#<1=7d#=3<1n#<1bq
+#undef OPTSTR_iotop
+#define OPTSTR_iotop ">0AaKOk*o*p*u*s#<1=7d#=3<1n#<1bq"
+#ifdef CLEANUP_iotop
+#undef CLEANUP_iotop
+#undef FOR_iotop
+#undef FLAG_q
+#undef FLAG_b
+#undef FLAG_n
+#undef FLAG_d
+#undef FLAG_s
+#undef FLAG_u
+#undef FLAG_p
+#undef FLAG_o
+#undef FLAG_k
+#undef FLAG_O
+#undef FLAG_K
+#undef FLAG_a
+#undef FLAG_A
+#endif
+
 // ip    
 #undef OPTSTR_ip
-#define OPTSTR_ip  0 
+#define OPTSTR_ip " "
 #ifdef CLEANUP_ip
 #undef CLEANUP_ip
 #undef FOR_ip
@@ -1100,7 +1164,7 @@
 
 // ipcrm   m*M*s*S*q*Q*
 #undef OPTSTR_ipcrm
-#define OPTSTR_ipcrm  0 
+#define OPTSTR_ipcrm "m*M*s*S*q*Q*"
 #ifdef CLEANUP_ipcrm
 #undef CLEANUP_ipcrm
 #undef FOR_ipcrm
@@ -1114,7 +1178,7 @@
 
 // ipcs   acptulsqmi#
 #undef OPTSTR_ipcs
-#define OPTSTR_ipcs  0 
+#define OPTSTR_ipcs "acptulsqmi#"
 #ifdef CLEANUP_ipcs
 #undef CLEANUP_ipcs
 #undef FOR_ipcs
@@ -1155,7 +1219,7 @@
 
 // killall5   ?o*ls: [!lo][!ls]
 #undef OPTSTR_killall5
-#define OPTSTR_killall5  0 
+#define OPTSTR_killall5 "?o*ls: [!lo][!ls]"
 #ifdef CLEANUP_killall5
 #undef CLEANUP_killall5
 #undef FOR_killall5
@@ -1166,7 +1230,7 @@
 
 // klogd   c#<1>8n
 #undef OPTSTR_klogd
-#define OPTSTR_klogd  0 
+#define OPTSTR_klogd "c#<1>8n"
 #ifdef CLEANUP_klogd
 #undef CLEANUP_klogd
 #undef FOR_klogd
@@ -1176,7 +1240,7 @@
 
 // last   f:W
 #undef OPTSTR_last
-#define OPTSTR_last  0 
+#define OPTSTR_last "f:W"
 #ifdef CLEANUP_last
 #undef CLEANUP_last
 #undef FOR_last
@@ -1186,7 +1250,7 @@
 
 // link   <2>2
 #undef OPTSTR_link
-#define OPTSTR_link  0 
+#define OPTSTR_link "<2>2"
 #ifdef CLEANUP_link
 #undef CLEANUP_link
 #undef FOR_link
@@ -1212,9 +1276,19 @@
 #undef FOR_load_policy
 #endif
 
+// log <1p:t: <1p:t:
+#undef OPTSTR_log
+#define OPTSTR_log "<1p:t:"
+#ifdef CLEANUP_log
+#undef CLEANUP_log
+#undef FOR_log
+#undef FLAG_t
+#undef FLAG_p
+#endif
+
 // logger   st:p:
 #undef OPTSTR_logger
-#define OPTSTR_logger  0 
+#define OPTSTR_logger "st:p:"
 #ifdef CLEANUP_logger
 #undef CLEANUP_logger
 #undef FOR_logger
@@ -1225,7 +1299,7 @@
 
 // login   >1f:ph:
 #undef OPTSTR_login
-#define OPTSTR_login  0 
+#define OPTSTR_login ">1f:ph:"
 #ifdef CLEANUP_login
 #undef CLEANUP_login
 #undef FOR_login
@@ -1261,9 +1335,9 @@
 #undef FLAG_S
 #endif
 
-// ls (color):;ZgoACFHLRSacdfhiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL] (color):;ZgoACFHLRSacdfhiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL]
+// ls (color):;ZgoACFHLRSabcdfhiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb] (color):;ZgoACFHLRSabcdfhiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]
 #undef OPTSTR_ls
-#define OPTSTR_ls "(color):;ZgoACFHLRSacdfhiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL]"
+#define OPTSTR_ls "(color):;ZgoACFHLRSabcdfhiklmnpqrstux1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]"
 #ifdef CLEANUP_ls
 #undef CLEANUP_ls
 #undef FOR_ls
@@ -1284,6 +1358,7 @@
 #undef FLAG_f
 #undef FLAG_d
 #undef FLAG_c
+#undef FLAG_b
 #undef FLAG_a
 #undef FLAG_S
 #undef FLAG_R
@@ -1313,15 +1388,15 @@
 
 // lsmod    
 #undef OPTSTR_lsmod
-#define OPTSTR_lsmod  0 
+#define OPTSTR_lsmod " "
 #ifdef CLEANUP_lsmod
 #undef CLEANUP_lsmod
 #undef FOR_lsmod
 #endif
 
-// lsof lp:t lp:t
+// lsof lp*t lp*t
 #undef OPTSTR_lsof
-#define OPTSTR_lsof "lp:t"
+#define OPTSTR_lsof "lp*t"
 #ifdef CLEANUP_lsof
 #undef CLEANUP_lsof
 #undef FOR_lsof
@@ -1332,7 +1407,7 @@
 
 // lspci   emkn@i:
 #undef OPTSTR_lspci
-#define OPTSTR_lspci  0 
+#define OPTSTR_lspci "emkn@i:"
 #ifdef CLEANUP_lspci
 #undef CLEANUP_lspci
 #undef FOR_lspci
@@ -1345,7 +1420,7 @@
 
 // lsusb    
 #undef OPTSTR_lsusb
-#define OPTSTR_lsusb  0 
+#define OPTSTR_lsusb " "
 #ifdef CLEANUP_lsusb
 #undef CLEANUP_lsusb
 #undef FOR_lsusb
@@ -1360,18 +1435,19 @@
 #undef FLAG_d
 #endif
 
-// md5sum b b
+// md5sum bc*[!bc] bc*[!bc]
 #undef OPTSTR_md5sum
-#define OPTSTR_md5sum "b"
+#define OPTSTR_md5sum "bc*[!bc]"
 #ifdef CLEANUP_md5sum
 #undef CLEANUP_md5sum
 #undef FOR_md5sum
+#undef FLAG_c
 #undef FLAG_b
 #endif
 
 // mdev   s
 #undef OPTSTR_mdev
-#define OPTSTR_mdev  0 
+#define OPTSTR_mdev "s"
 #ifdef CLEANUP_mdev
 #undef CLEANUP_mdev
 #undef FOR_mdev
@@ -1380,7 +1456,7 @@
 
 // mix   c:d:l#r#
 #undef OPTSTR_mix
-#define OPTSTR_mix  0 
+#define OPTSTR_mix "c:d:l#r#"
 #ifdef CLEANUP_mix
 #undef CLEANUP_mix
 #undef FOR_mix
@@ -1404,7 +1480,7 @@
 
 // mke2fs   <1>2g:Fnqm#N#i#b#
 #undef OPTSTR_mke2fs
-#define OPTSTR_mke2fs  0 
+#define OPTSTR_mke2fs "<1>2g:Fnqm#N#i#b#"
 #ifdef CLEANUP_mke2fs
 #undef CLEANUP_mke2fs
 #undef FOR_mke2fs
@@ -1441,7 +1517,7 @@
 
 // mkpasswd   >2S:m:P#=0<0
 #undef OPTSTR_mkpasswd
-#define OPTSTR_mkpasswd  0 
+#define OPTSTR_mkpasswd ">2S:m:P#=0<0"
 #ifdef CLEANUP_mkpasswd
 #undef CLEANUP_mkpasswd
 #undef FOR_mkpasswd
@@ -1450,17 +1526,18 @@
 #undef FLAG_S
 #endif
 
-// mkswap <1>1 <1>1
+// mkswap <1>1L: <1>1L:
 #undef OPTSTR_mkswap
-#define OPTSTR_mkswap "<1>1"
+#define OPTSTR_mkswap "<1>1L:"
 #ifdef CLEANUP_mkswap
 #undef CLEANUP_mkswap
 #undef FOR_mkswap
+#undef FLAG_L
 #endif
 
-// mktemp >1qd(directory)p(tmpdir): >1qd(directory)p(tmpdir):
+// mktemp >1uqd(directory)p(tmpdir): >1uqd(directory)p(tmpdir):
 #undef OPTSTR_mktemp
-#define OPTSTR_mktemp ">1qd(directory)p(tmpdir):"
+#define OPTSTR_mktemp ">1uqd(directory)p(tmpdir):"
 #ifdef CLEANUP_mktemp
 #undef CLEANUP_mktemp
 #undef FOR_mktemp
@@ -1469,6 +1546,7 @@
 #undef FLAG_directory
 #undef FLAG_d
 #undef FLAG_q
+#undef FLAG_u
 #endif
 
 // modinfo <1b:k:F:0 <1b:k:F:0
@@ -1485,7 +1563,7 @@
 
 // modprobe   alrqvsDb
 #undef OPTSTR_modprobe
-#define OPTSTR_modprobe  0 
+#define OPTSTR_modprobe "alrqvsDb"
 #ifdef CLEANUP_modprobe
 #undef CLEANUP_modprobe
 #undef FOR_modprobe
@@ -1501,7 +1579,7 @@
 
 // more    
 #undef OPTSTR_more
-#define OPTSTR_more  0 
+#define OPTSTR_more " "
 #ifdef CLEANUP_more
 #undef CLEANUP_more
 #undef FOR_more
@@ -1535,14 +1613,15 @@
 #undef FLAG_q
 #endif
 
-// mv <2vnFfi[-ni] <2vnFfi[-ni]
+// mv <2vnF(remove-destination)fi[-ni] <2vnF(remove-destination)fi[-ni]
 #undef OPTSTR_mv
-#define OPTSTR_mv "<2vnFfi[-ni]"
+#define OPTSTR_mv "<2vnF(remove-destination)fi[-ni]"
 #ifdef CLEANUP_mv
 #undef CLEANUP_mv
 #undef FOR_mv
 #undef FLAG_i
 #undef FLAG_f
+#undef FLAG_remove_destination
 #undef FLAG_F
 #undef FLAG_n
 #undef FLAG_v
@@ -1627,7 +1706,7 @@
 
 // nproc   (all)
 #undef OPTSTR_nproc
-#define OPTSTR_nproc  0 
+#define OPTSTR_nproc "(all)"
 #ifdef CLEANUP_nproc
 #undef CLEANUP_nproc
 #undef FOR_nproc
@@ -1636,7 +1715,7 @@
 
 // nsenter   <1F(no-fork)t#<1(target)i:(ipc);m:(mount);n:(net);p:(pid);u:(uts);U:(user);
 #undef OPTSTR_nsenter
-#define OPTSTR_nsenter  0 
+#define OPTSTR_nsenter "<1F(no-fork)t#<1(target)i:(ipc);m:(mount);n:(net);p:(pid);u:(uts);U:(user);"
 #ifdef CLEANUP_nsenter
 #undef CLEANUP_nsenter
 #undef FOR_nsenter
@@ -1658,9 +1737,9 @@
 #undef FLAG_F
 #endif
 
-// od j#vN#xsodcbA:t* j#vN#xsodcbA:t*
+// od j#vw#<1=16N#xsodcbA:t* j#vw#<1=16N#xsodcbA:t*
 #undef OPTSTR_od
-#define OPTSTR_od "j#vN#xsodcbA:t*"
+#define OPTSTR_od "j#vw#<1=16N#xsodcbA:t*"
 #ifdef CLEANUP_od
 #undef CLEANUP_od
 #undef FOR_od
@@ -1673,13 +1752,14 @@
 #undef FLAG_s
 #undef FLAG_x
 #undef FLAG_N
+#undef FLAG_w
 #undef FLAG_v
 #undef FLAG_j
 #endif
 
 // oneit   ^<1nc:p3[!pn]
 #undef OPTSTR_oneit
-#define OPTSTR_oneit  0 
+#define OPTSTR_oneit "^<1nc:p3[!pn]"
 #ifdef CLEANUP_oneit
 #undef CLEANUP_oneit
 #undef FOR_oneit
@@ -1691,7 +1771,7 @@
 
 // openvt   c#<1>63sw
 #undef OPTSTR_openvt
-#define OPTSTR_openvt  0 
+#define OPTSTR_openvt "c#<1>63sw"
 #ifdef CLEANUP_openvt
 #undef CLEANUP_openvt
 #undef FOR_openvt
@@ -1710,7 +1790,7 @@
 
 // passwd   >1a:dlu
 #undef OPTSTR_passwd
-#define OPTSTR_passwd  0 
+#define OPTSTR_passwd ">1a:dlu"
 #ifdef CLEANUP_passwd
 #undef CLEANUP_passwd
 #undef FOR_passwd
@@ -1730,9 +1810,9 @@
 #undef FLAG_d
 #endif
 
-// patch ulp#i:R xulp#i:R
+// patch (dry-run)d:ulp#i:R (dry-run)xd:ulp#i:R
 #undef OPTSTR_patch
-#define OPTSTR_patch "ulp#i:R"
+#define OPTSTR_patch "(dry-run)\ 1d:ulp#i:R"
 #ifdef CLEANUP_patch
 #undef CLEANUP_patch
 #undef FOR_patch
@@ -1741,23 +1821,33 @@
 #undef FLAG_p
 #undef FLAG_l
 #undef FLAG_u
+#undef FLAG_d
 #undef FLAG_x
+#undef FLAG_dry_run
 #endif
 
-// pgrep ?P# s# xvonlf[!sP] ?P# s# xvonlf[!sP]
+// pgrep ?cld:u*U*t*s*P*g*G*fnovxL:[-no] ?cld:u*U*t*s*P*g*G*fnovxL:[-no]
 #undef OPTSTR_pgrep
-#define OPTSTR_pgrep "?P# s# xvonlf[!sP]"
+#define OPTSTR_pgrep "?cld:u*U*t*s*P*g*G*fnovxL:[-no]"
 #ifdef CLEANUP_pgrep
 #undef CLEANUP_pgrep
 #undef FOR_pgrep
-#undef FLAG_f
-#undef FLAG_l
-#undef FLAG_n
-#undef FLAG_o
-#undef FLAG_v
+#undef FLAG_L
 #undef FLAG_x
-#undef FLAG_s
+#undef FLAG_v
+#undef FLAG_o
+#undef FLAG_n
+#undef FLAG_f
+#undef FLAG_G
+#undef FLAG_g
 #undef FLAG_P
+#undef FLAG_s
+#undef FLAG_t
+#undef FLAG_U
+#undef FLAG_u
+#undef FLAG_d
+#undef FLAG_l
+#undef FLAG_c
 #endif
 
 // pidof <1so: <1so:
@@ -1772,7 +1862,7 @@
 
 // ping   <1>1t#<0>255c#<0s#<0>65535I:W#<0w#<0q46[-46]
 #undef OPTSTR_ping
-#define OPTSTR_ping  0 
+#define OPTSTR_ping "<1>1t#<0>255c#<0s#<0>65535I:W#<0w#<0q46[-46]"
 #ifdef CLEANUP_ping
 #undef CLEANUP_ping
 #undef FOR_ping
@@ -1795,6 +1885,28 @@
 #undef FOR_pivot_root
 #endif
 
+// pkill ?Vu*U*t*s*P*g*G*fnovxl:[-no] ?Vu*U*t*s*P*g*G*fnovxl:[-no]
+#undef OPTSTR_pkill
+#define OPTSTR_pkill "?Vu*U*t*s*P*g*G*fnovxl:[-no]"
+#ifdef CLEANUP_pkill
+#undef CLEANUP_pkill
+#undef FOR_pkill
+#undef FLAG_l
+#undef FLAG_x
+#undef FLAG_v
+#undef FLAG_o
+#undef FLAG_n
+#undef FLAG_f
+#undef FLAG_G
+#undef FLAG_g
+#undef FLAG_P
+#undef FLAG_s
+#undef FLAG_t
+#undef FLAG_U
+#undef FLAG_u
+#undef FLAG_V
+#endif
+
 // pmap <1xq <1xq
 #undef OPTSTR_pmap
 #define OPTSTR_pmap "<1xq"
@@ -1823,9 +1935,9 @@
 #undef FOR_printf
 #endif
 
-// ps (ppid)*aAdeflo*p(pid)*s*t*u*U*g*G*wZ[!ol][+Ae] (ppid)*aAdeflo*p(pid)*s*t*u*U*g*G*wZ[!ol][+Ae]
+// ps k(sort)*P(ppid)*aAdeflMno*O*p(pid)*s*t*Tu*U*g*G*wZ[!ol][+Ae][!oO] k(sort)*P(ppid)*aAdeflMno*O*p(pid)*s*t*Tu*U*g*G*wZ[!ol][+Ae][!oO]
 #undef OPTSTR_ps
-#define OPTSTR_ps "(ppid)*aAdeflo*p(pid)*s*t*u*U*g*G*wZ[!ol][+Ae]"
+#define OPTSTR_ps "k(sort)*P(ppid)*aAdeflMno*O*p(pid)*s*t*Tu*U*g*G*wZ[!ol][+Ae][!oO]"
 #ifdef CLEANUP_ps
 #undef CLEANUP_ps
 #undef FOR_ps
@@ -1835,11 +1947,15 @@
 #undef FLAG_g
 #undef FLAG_U
 #undef FLAG_u
+#undef FLAG_T
 #undef FLAG_t
 #undef FLAG_s
 #undef FLAG_pid
 #undef FLAG_p
+#undef FLAG_O
 #undef FLAG_o
+#undef FLAG_n
+#undef FLAG_M
 #undef FLAG_l
 #undef FLAG_f
 #undef FLAG_e
@@ -1847,6 +1963,9 @@
 #undef FLAG_A
 #undef FLAG_a
 #undef FLAG_ppid
+#undef FLAG_P
+#undef FLAG_sort
+#undef FLAG_k
 #endif
 
 // pwd >0LP[-LP] >0LP[-LP]
@@ -1870,7 +1989,7 @@
 
 // readahead    
 #undef OPTSTR_readahead
-#define OPTSTR_readahead  0 
+#define OPTSTR_readahead " "
 #ifdef CLEANUP_readahead
 #undef CLEANUP_readahead
 #undef FOR_readahead
@@ -1898,7 +2017,7 @@
 
 // reboot   fn
 #undef OPTSTR_reboot
-#define OPTSTR_reboot  0 
+#define OPTSTR_reboot "fn"
 #ifdef CLEANUP_reboot
 #undef CLEANUP_reboot
 #undef FOR_reboot
@@ -1920,7 +2039,7 @@
 
 // reset    
 #undef OPTSTR_reset
-#define OPTSTR_reset  0 
+#define OPTSTR_reset " "
 #ifdef CLEANUP_reset
 #undef CLEANUP_reset
 #undef FOR_reset
@@ -1942,7 +2061,7 @@
 
 // rev    
 #undef OPTSTR_rev
-#define OPTSTR_rev  0 
+#define OPTSTR_rev " "
 #ifdef CLEANUP_rev
 #undef CLEANUP_rev
 #undef FOR_rev
@@ -1987,7 +2106,7 @@
 #undef FLAG_w
 #endif
 
-// route ?neA: ?neA:
+// route   ?neA:
 #undef OPTSTR_route
 #define OPTSTR_route "?neA:"
 #ifdef CLEANUP_route
@@ -2021,12 +2140,21 @@
 #undef FLAG_version
 #endif
 
-// seq <1>3?f:s: <1>3?f:s:
+// sendevent <4>4 <4>4
+#undef OPTSTR_sendevent
+#define OPTSTR_sendevent "<4>4"
+#ifdef CLEANUP_sendevent
+#undef CLEANUP_sendevent
+#undef FOR_sendevent
+#endif
+
+// seq <1>3?f:s:w[!fw] <1>3?f:s:w[!fw]
 #undef OPTSTR_seq
-#define OPTSTR_seq "<1>3?f:s:"
+#define OPTSTR_seq "<1>3?f:s:w[!fw]"
 #ifdef CLEANUP_seq
 #undef CLEANUP_seq
 #undef FOR_seq
+#undef FLAG_w
 #undef FLAG_s
 #undef FLAG_f
 #endif
@@ -2058,7 +2186,7 @@
 
 // sh   c:i
 #undef OPTSTR_sh
-#define OPTSTR_sh  0 
+#define OPTSTR_sh "c:i"
 #ifdef CLEANUP_sh
 #undef CLEANUP_sh
 #undef FOR_sh
@@ -2066,18 +2194,19 @@
 #undef FLAG_c
 #endif
 
-// sha1sum b b
+// sha1sum bc*[!bc] bc*[!bc]
 #undef OPTSTR_sha1sum
-#define OPTSTR_sha1sum "b"
+#define OPTSTR_sha1sum "bc*[!bc]"
 #ifdef CLEANUP_sha1sum
 #undef CLEANUP_sha1sum
 #undef FOR_sha1sum
+#undef FLAG_c
 #undef FLAG_b
 #endif
 
 // shred   <1zxus#<1n#<1o#<0f
 #undef OPTSTR_shred
-#define OPTSTR_shred  0 
+#define OPTSTR_shred "<1zxus#<1n#<1o#<0f"
 #ifdef CLEANUP_shred
 #undef CLEANUP_shred
 #undef FOR_shred
@@ -2092,7 +2221,7 @@
 
 // skeleton   (walrus)(blubber):;(also):e@d*c#b:a
 #undef OPTSTR_skeleton
-#define OPTSTR_skeleton  0 
+#define OPTSTR_skeleton "(walrus)(blubber):;(also):e@d*c#b:a"
 #ifdef CLEANUP_skeleton
 #undef CLEANUP_skeleton
 #undef FOR_skeleton
@@ -2108,7 +2237,7 @@
 
 // skeleton_alias   b#dq
 #undef OPTSTR_skeleton_alias
-#define OPTSTR_skeleton_alias  0 
+#define OPTSTR_skeleton_alias "b#dq"
 #ifdef CLEANUP_skeleton_alias
 #undef CLEANUP_skeleton_alias
 #undef FOR_skeleton_alias
@@ -2163,16 +2292,34 @@
 #undef FLAG_a
 #endif
 
-// stat c:f c:f
+// start    
+#undef OPTSTR_start
+#define OPTSTR_start " "
+#ifdef CLEANUP_start
+#undef CLEANUP_start
+#undef FOR_start
+#endif
+
+// stat <1c:fLt <1c:fLt
 #undef OPTSTR_stat
-#define OPTSTR_stat "c:f"
+#define OPTSTR_stat "<1c:fLt"
 #ifdef CLEANUP_stat
 #undef CLEANUP_stat
 #undef FOR_stat
+#undef FLAG_t
+#undef FLAG_L
 #undef FLAG_f
 #undef FLAG_c
 #endif
 
+// stop    
+#undef OPTSTR_stop
+#define OPTSTR_stop " "
+#ifdef CLEANUP_stop
+#undef CLEANUP_stop
+#undef FOR_stop
+#endif
+
 // strings an#=4<1fo an#=4<1fo
 #undef OPTSTR_strings
 #define OPTSTR_strings "an#=4<1fo"
@@ -2187,7 +2334,7 @@
 
 // su   lmpc:s:
 #undef OPTSTR_su
-#define OPTSTR_su  0 
+#define OPTSTR_su "lmpc:s:"
 #ifdef CLEANUP_su
 #undef CLEANUP_su
 #undef FOR_su
@@ -2200,7 +2347,7 @@
 
 // sulogin   t#<0=0
 #undef OPTSTR_sulogin
-#define OPTSTR_sulogin  0 
+#define OPTSTR_sulogin "t#<0=0"
 #ifdef CLEANUP_sulogin
 #undef CLEANUP_sulogin
 #undef FOR_sulogin
@@ -2215,16 +2362,17 @@
 #undef FOR_swapoff
 #endif
 
-// swapon <1>1p#<0>32767 <1>1p#<0>32767
+// swapon <1>1p#<0>32767d <1>1p#<0>32767d
 #undef OPTSTR_swapon
-#define OPTSTR_swapon "<1>1p#<0>32767"
+#define OPTSTR_swapon "<1>1p#<0>32767d"
 #ifdef CLEANUP_swapon
 #undef CLEANUP_swapon
 #undef FOR_swapon
+#undef FLAG_d
 #undef FLAG_p
 #endif
 
-// switch_root <2c:h <2c:h
+// switch_root   <2c:h
 #undef OPTSTR_switch_root
 #define OPTSTR_switch_root "<2c:h"
 #ifdef CLEANUP_switch_root
@@ -2236,7 +2384,7 @@
 
 // sync    
 #undef OPTSTR_sync
-#define OPTSTR_sync  0 
+#define OPTSTR_sync " "
 #ifdef CLEANUP_sync
 #undef CLEANUP_sync
 #undef FOR_sync
@@ -2260,7 +2408,7 @@
 
 // syslogd   >0l#<1>8=8R:b#<0>99=1s#<0=200m#<0>71582787=20O:p:f:a:nSKLD
 #undef OPTSTR_syslogd
-#define OPTSTR_syslogd  0 
+#define OPTSTR_syslogd ">0l#<1>8=8R:b#<0>99=1s#<0=200m#<0>71582787=20O:p:f:a:nSKLD"
 #ifdef CLEANUP_syslogd
 #undef CLEANUP_syslogd
 #undef FOR_syslogd
@@ -2282,7 +2430,7 @@
 
 // tac    
 #undef OPTSTR_tac
-#define OPTSTR_tac  0 
+#define OPTSTR_tac " "
 #ifdef CLEANUP_tac
 #undef CLEANUP_tac
 #undef FOR_tac
@@ -2355,7 +2503,7 @@
 
 // tcpsvd   ^<3c#=30<1C:b#=20<0u:l:hEv
 #undef OPTSTR_tcpsvd
-#define OPTSTR_tcpsvd  0 
+#define OPTSTR_tcpsvd "^<3c#=30<1C:b#=20<0u:l:hEv"
 #ifdef CLEANUP_tcpsvd
 #undef CLEANUP_tcpsvd
 #undef FOR_tcpsvd
@@ -2381,7 +2529,7 @@
 
 // telnet   <1>2
 #undef OPTSTR_telnet
-#define OPTSTR_telnet  0 
+#define OPTSTR_telnet "<1>2"
 #ifdef CLEANUP_telnet
 #undef CLEANUP_telnet
 #undef FOR_telnet
@@ -2389,7 +2537,7 @@
 
 // telnetd   w#<0b:p#<0>65535=23f:l:FSKi[!wi]
 #undef OPTSTR_telnetd
-#define OPTSTR_telnetd  0 
+#define OPTSTR_telnetd "w#<0b:p#<0>65535=23f:l:FSKi[!wi]"
 #ifdef CLEANUP_telnetd
 #undef CLEANUP_telnetd
 #undef FOR_telnetd
@@ -2406,7 +2554,7 @@
 
 // test    
 #undef OPTSTR_test
-#define OPTSTR_test  0 
+#define OPTSTR_test " "
 #ifdef CLEANUP_test
 #undef CLEANUP_test
 #undef FOR_test
@@ -2414,7 +2562,7 @@
 
 // test_human_readable   <1>1ibs
 #undef OPTSTR_test_human_readable
-#define OPTSTR_test_human_readable  0 
+#define OPTSTR_test_human_readable "<1>1ibs"
 #ifdef CLEANUP_test_human_readable
 #undef CLEANUP_test_human_readable
 #undef FOR_test_human_readable
@@ -2423,9 +2571,77 @@
 #undef FLAG_i
 #endif
 
+// test_many_options   ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba
+#undef OPTSTR_test_many_options
+#define OPTSTR_test_many_options "ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba"
+#ifdef CLEANUP_test_many_options
+#undef CLEANUP_test_many_options
+#undef FOR_test_many_options
+#undef FLAG_a
+#undef FLAG_b
+#undef FLAG_c
+#undef FLAG_d
+#undef FLAG_e
+#undef FLAG_f
+#undef FLAG_g
+#undef FLAG_h
+#undef FLAG_i
+#undef FLAG_j
+#undef FLAG_k
+#undef FLAG_l
+#undef FLAG_m
+#undef FLAG_n
+#undef FLAG_o
+#undef FLAG_p
+#undef FLAG_q
+#undef FLAG_r
+#undef FLAG_s
+#undef FLAG_t
+#undef FLAG_u
+#undef FLAG_v
+#undef FLAG_w
+#undef FLAG_x
+#undef FLAG_y
+#undef FLAG_z
+#undef FLAG_A
+#undef FLAG_B
+#undef FLAG_C
+#undef FLAG_D
+#undef FLAG_E
+#undef FLAG_F
+#undef FLAG_G
+#undef FLAG_H
+#undef FLAG_I
+#undef FLAG_J
+#undef FLAG_K
+#undef FLAG_L
+#undef FLAG_M
+#undef FLAG_N
+#undef FLAG_O
+#undef FLAG_P
+#undef FLAG_Q
+#undef FLAG_R
+#undef FLAG_S
+#undef FLAG_T
+#undef FLAG_U
+#undef FLAG_V
+#undef FLAG_W
+#undef FLAG_X
+#undef FLAG_Y
+#undef FLAG_Z
+#endif
+
+// test_scankey    
+#undef OPTSTR_test_scankey
+#define OPTSTR_test_scankey " "
+#ifdef CLEANUP_test_scankey
+#undef CLEANUP_test_scankey
+#undef FOR_test_scankey
+#endif
+
 // tftp   <1b#<8>65464r:l:g|p|[!gp]
 #undef OPTSTR_tftp
-#define OPTSTR_tftp  0 
+#define OPTSTR_tftp "<1b#<8>65464r:l:g|p|[!gp]"
 #ifdef CLEANUP_tftp
 #undef CLEANUP_tftp
 #undef FOR_tftp
@@ -2438,7 +2654,7 @@
 
 // tftpd   rcu:l
 #undef OPTSTR_tftpd
-#define OPTSTR_tftpd  0 
+#define OPTSTR_tftpd "rcu:l"
 #ifdef CLEANUP_tftpd
 #undef CLEANUP_tftpd
 #undef FOR_tftpd
@@ -2468,16 +2684,24 @@
 #undef FLAG_v
 #endif
 
-// top >0d#=3n#<1mb >0d#=3n#<1mb
+// top >0mO*Hk*o*p*u*s#<1d#=3<1n#<1bq[!oO] >0mO*Hk*o*p*u*s#<1d#=3<1n#<1bq[!oO]
 #undef OPTSTR_top
-#define OPTSTR_top ">0d#=3n#<1mb"
+#define OPTSTR_top ">0mO*Hk*o*p*u*s#<1d#=3<1n#<1bq[!oO]"
 #ifdef CLEANUP_top
 #undef CLEANUP_top
 #undef FOR_top
+#undef FLAG_q
 #undef FLAG_b
-#undef FLAG_m
 #undef FLAG_n
 #undef FLAG_d
+#undef FLAG_s
+#undef FLAG_u
+#undef FLAG_p
+#undef FLAG_o
+#undef FLAG_k
+#undef FLAG_H
+#undef FLAG_O
+#undef FLAG_m
 #endif
 
 // touch acd:mr:t:h[!dtr] acd:mr:t:h[!dtr]
@@ -2497,7 +2721,7 @@
 
 // toybox    
 #undef OPTSTR_toybox
-#define OPTSTR_toybox  0 
+#define OPTSTR_toybox " "
 #ifdef CLEANUP_toybox
 #undef CLEANUP_toybox
 #undef FOR_toybox
@@ -2545,7 +2769,7 @@
 
 // true    
 #undef OPTSTR_true
-#define OPTSTR_true  0 
+#define OPTSTR_true " "
 #ifdef CLEANUP_true
 #undef CLEANUP_true
 #undef FOR_true
@@ -2570,6 +2794,34 @@
 #undef FLAG_s
 #endif
 
+// ulimit >1P#<1SHavutsrRqpnmlifedc[-SH][!apvutsrRqnmlifedc] >1P#<1SHavutsrRqpnmlifedc[-SH][!apvutsrRqnmlifedc]
+#undef OPTSTR_ulimit
+#define OPTSTR_ulimit ">1P#<1SHavutsrRqpnmlifedc[-SH][!apvutsrRqnmlifedc]"
+#ifdef CLEANUP_ulimit
+#undef CLEANUP_ulimit
+#undef FOR_ulimit
+#undef FLAG_c
+#undef FLAG_d
+#undef FLAG_e
+#undef FLAG_f
+#undef FLAG_i
+#undef FLAG_l
+#undef FLAG_m
+#undef FLAG_n
+#undef FLAG_p
+#undef FLAG_q
+#undef FLAG_R
+#undef FLAG_r
+#undef FLAG_s
+#undef FLAG_t
+#undef FLAG_u
+#undef FLAG_v
+#undef FLAG_a
+#undef FLAG_H
+#undef FLAG_S
+#undef FLAG_P
+#endif
+
 // umount ndDflrat*v[!na] ndDflrat*v[!na]
 #undef OPTSTR_umount
 #define OPTSTR_umount "ndDflrat*v[!na]"
@@ -2620,7 +2872,7 @@
 
 // unix2dos    
 #undef OPTSTR_unix2dos
-#define OPTSTR_unix2dos  0 
+#define OPTSTR_unix2dos " "
 #ifdef CLEANUP_unix2dos
 #undef CLEANUP_unix2dos
 #undef FOR_unix2dos
@@ -2628,30 +2880,39 @@
 
 // unlink   <1>1
 #undef OPTSTR_unlink
-#define OPTSTR_unlink  0 
+#define OPTSTR_unlink "<1>1"
 #ifdef CLEANUP_unlink
 #undef CLEANUP_unlink
 #undef FOR_unlink
 #endif
 
-// unshare   <1^rimnpuU
+// unshare   <1^f(fork);r(map-root-user);i:(ipc);m:(mount);n:(net);p:(pid);u:(uts);U:(user);
 #undef OPTSTR_unshare
-#define OPTSTR_unshare  0 
+#define OPTSTR_unshare "<1^f(fork);r(map-root-user);i:(ipc);m:(mount);n:(net);p:(pid);u:(uts);U:(user);"
 #ifdef CLEANUP_unshare
 #undef CLEANUP_unshare
 #undef FOR_unshare
+#undef FLAG_user
 #undef FLAG_U
+#undef FLAG_uts
 #undef FLAG_u
+#undef FLAG_pid
 #undef FLAG_p
+#undef FLAG_net
 #undef FLAG_n
+#undef FLAG_mount
 #undef FLAG_m
+#undef FLAG_ipc
 #undef FLAG_i
+#undef FLAG_map_root_user
 #undef FLAG_r
+#undef FLAG_fork
+#undef FLAG_f
 #endif
 
 // uptime    
 #undef OPTSTR_uptime
-#define OPTSTR_uptime  0 
+#define OPTSTR_uptime " "
 #ifdef CLEANUP_uptime
 #undef CLEANUP_uptime
 #undef FOR_uptime
@@ -2659,7 +2920,7 @@
 
 // useradd   <1>2u#<0G:s:g:h:SDH
 #undef OPTSTR_useradd
-#define OPTSTR_useradd  0 
+#define OPTSTR_useradd "<1>2u#<0G:s:g:h:SDH"
 #ifdef CLEANUP_useradd
 #undef CLEANUP_useradd
 #undef FOR_useradd
@@ -2675,7 +2936,7 @@
 
 // userdel   <1>1r
 #undef OPTSTR_userdel
-#define OPTSTR_userdel  0 
+#define OPTSTR_userdel "<1>1r"
 #ifdef CLEANUP_userdel
 #undef CLEANUP_userdel
 #undef FOR_userdel
@@ -2692,7 +2953,7 @@
 
 // uudecode   >1o:
 #undef OPTSTR_uudecode
-#define OPTSTR_uudecode  0 
+#define OPTSTR_uudecode ">1o:"
 #ifdef CLEANUP_uudecode
 #undef CLEANUP_uudecode
 #undef FOR_uudecode
@@ -2701,7 +2962,7 @@
 
 // uuencode   <1>2m
 #undef OPTSTR_uuencode
-#define OPTSTR_uuencode  0 
+#define OPTSTR_uuencode "<1>2m"
 #ifdef CLEANUP_uuencode
 #undef CLEANUP_uuencode
 #undef FOR_uuencode
@@ -2716,6 +2977,14 @@
 #undef FOR_vconfig
 #endif
 
+// vi   <1>1
+#undef OPTSTR_vi
+#define OPTSTR_vi "<1>1"
+#ifdef CLEANUP_vi
+#undef CLEANUP_vi
+#undef FOR_vi
+#endif
+
 // vmstat >2n >2n
 #undef OPTSTR_vmstat
 #define OPTSTR_vmstat ">2n"
@@ -2727,7 +2996,7 @@
 
 // w    
 #undef OPTSTR_w
-#define OPTSTR_w  0 
+#define OPTSTR_w " "
 #ifdef CLEANUP_w
 #undef CLEANUP_w
 #undef FOR_w
@@ -2735,7 +3004,7 @@
 
 // watch   ^<1n#<0=2te
 #undef OPTSTR_watch
-#define OPTSTR_watch  0 
+#define OPTSTR_watch "^<1n#<0=2te"
 #ifdef CLEANUP_watch
 #undef CLEANUP_watch
 #undef FOR_watch
@@ -2756,6 +3025,15 @@
 #undef FLAG_m
 #endif
 
+// wget   f:
+#undef OPTSTR_wget
+#define OPTSTR_wget "f:"
+#ifdef CLEANUP_wget
+#undef CLEANUP_wget
+#undef FOR_wget
+#undef FLAG_f
+#endif
+
 // which <1a <1a
 #undef OPTSTR_which
 #define OPTSTR_which "<1a"
@@ -2767,7 +3045,7 @@
 
 // who   a
 #undef OPTSTR_who
-#define OPTSTR_who  0 
+#define OPTSTR_who "a"
 #ifdef CLEANUP_who
 #undef CLEANUP_who
 #undef FOR_who
@@ -2792,12 +3070,15 @@
 #undef FLAG_I
 #endif
 
-// xxd >1c#<1>4096=16l#g#<1=2 >1c#<1>4096=16l#g#<1=2
+// xxd >1c#<1>4096=16l#g#<1=2prs#[!rs] >1c#<1>4096=16l#g#<1=2prs#[!rs]
 #undef OPTSTR_xxd
-#define OPTSTR_xxd ">1c#<1>4096=16l#g#<1=2"
+#define OPTSTR_xxd ">1c#<1>4096=16l#g#<1=2prs#[!rs]"
 #ifdef CLEANUP_xxd
 #undef CLEANUP_xxd
 #undef FOR_xxd
+#undef FLAG_s
+#undef FLAG_r
+#undef FLAG_p
 #undef FLAG_g
 #undef FLAG_l
 #undef FLAG_c
@@ -2805,7 +3086,7 @@
 
 // xzcat    
 #undef OPTSTR_xzcat
-#define OPTSTR_xzcat  0 
+#define OPTSTR_xzcat " "
 #ifdef CLEANUP_xzcat
 #undef CLEANUP_xzcat
 #undef FOR_xzcat
@@ -2813,7 +3094,7 @@
 
 // yes    
 #undef OPTSTR_yes
-#define OPTSTR_yes  0 
+#define OPTSTR_yes " "
 #ifdef CLEANUP_yes
 #undef CLEANUP_yes
 #undef FOR_yes
@@ -2821,7 +3102,7 @@
 
 // zcat    
 #undef OPTSTR_zcat
-#define OPTSTR_zcat  0 
+#define OPTSTR_zcat " "
 #ifdef CLEANUP_zcat
 #undef CLEANUP_zcat
 #undef FOR_zcat
@@ -3108,6 +3389,7 @@
 #define FLAG_u (1<<7)
 #define FLAG_d (1<<8)
 #define FLAG_m (1<<9)
+#define FLAG_no_preserve_owner (1<<10)
 #endif
 
 #ifdef FOR_crond
@@ -3209,6 +3491,26 @@
 #define FLAG_V (FORCED_FLAG<<22)
 #endif
 
+#ifdef FOR_dhcp6
+#ifndef TT
+#define TT this.dhcp6
+#endif
+#define FLAG_f (FORCED_FLAG<<0)
+#define FLAG_b (FORCED_FLAG<<1)
+#define FLAG_n (FORCED_FLAG<<2)
+#define FLAG_q (FORCED_FLAG<<3)
+#define FLAG_v (FORCED_FLAG<<4)
+#define FLAG_R (FORCED_FLAG<<5)
+#define FLAG_S (FORCED_FLAG<<6)
+#define FLAG_i (FORCED_FLAG<<7)
+#define FLAG_p (FORCED_FLAG<<8)
+#define FLAG_s (FORCED_FLAG<<9)
+#define FLAG_t (FORCED_FLAG<<10)
+#define FLAG_T (FORCED_FLAG<<11)
+#define FLAG_A (FORCED_FLAG<<12)
+#define FLAG_r (FORCED_FLAG<<13)
+#endif
+
 #ifdef FOR_dhcpd
 #ifndef TT
 #define TT this.dhcpd
@@ -3329,7 +3631,8 @@
 #ifndef TT
 #define TT this.env
 #endif
-#define FLAG_i (1<<0)
+#define FLAG_u (1<<0)
+#define FLAG_i (1<<1)
 #endif
 
 #ifdef FOR_exit
@@ -3382,6 +3685,12 @@
 #define FLAG_C (FORCED_FLAG<<5)
 #endif
 
+#ifdef FOR_file
+#ifndef TT
+#define TT this.file
+#endif
+#endif
+
 #ifdef FOR_find
 #ifndef TT
 #define TT this.find
@@ -3419,6 +3728,7 @@
 #define FLAG_m (1<<2)
 #define FLAG_g (1<<3)
 #define FLAG_t (1<<4)
+#define FLAG_h (1<<5)
 #endif
 
 #ifdef FOR_freeramdisk
@@ -3484,6 +3794,7 @@
 #ifndef TT
 #define TT this.getprop
 #endif
+#define FLAG_Z (1<<0)
 #endif
 
 #ifdef FOR_getty
@@ -3529,6 +3840,9 @@
 #define FLAG_E (1<<19)
 #define FLAG_z (1<<20)
 #define FLAG_Z (1<<21)
+#define FLAG_A (1<<22)
+#define FLAG_B (1<<23)
+#define FLAG_C (1<<24)
 #endif
 
 #ifdef FOR_groupadd
@@ -3632,6 +3946,8 @@
 #ifndef TT
 #define TT this.hostname
 #endif
+#define FLAG_F (1<<0)
+#define FLAG_b (1<<1)
 #endif
 
 #ifdef FOR_hwclock
@@ -3733,6 +4049,25 @@
 #endif
 #endif
 
+#ifdef FOR_iotop
+#ifndef TT
+#define TT this.iotop
+#endif
+#define FLAG_q (FORCED_FLAG<<0)
+#define FLAG_b (FORCED_FLAG<<1)
+#define FLAG_n (FORCED_FLAG<<2)
+#define FLAG_d (FORCED_FLAG<<3)
+#define FLAG_s (FORCED_FLAG<<4)
+#define FLAG_u (FORCED_FLAG<<5)
+#define FLAG_p (FORCED_FLAG<<6)
+#define FLAG_o (FORCED_FLAG<<7)
+#define FLAG_k (FORCED_FLAG<<8)
+#define FLAG_O (FORCED_FLAG<<9)
+#define FLAG_K (FORCED_FLAG<<10)
+#define FLAG_a (FORCED_FLAG<<11)
+#define FLAG_A (FORCED_FLAG<<12)
+#endif
+
 #ifdef FOR_ip
 #ifndef TT
 #define TT this.ip
@@ -3833,6 +4168,14 @@
 #endif
 #endif
 
+#ifdef FOR_log
+#ifndef TT
+#define TT this.log
+#endif
+#define FLAG_t (1<<0)
+#define FLAG_p (1<<1)
+#endif
+
 #ifdef FOR_logger
 #ifndef TT
 #define TT this.logger
@@ -3895,18 +4238,19 @@
 #define FLAG_f (1<<14)
 #define FLAG_d (1<<15)
 #define FLAG_c (1<<16)
-#define FLAG_a (1<<17)
-#define FLAG_S (1<<18)
-#define FLAG_R (1<<19)
-#define FLAG_L (1<<20)
-#define FLAG_H (1<<21)
-#define FLAG_F (1<<22)
-#define FLAG_C (1<<23)
-#define FLAG_A (1<<24)
-#define FLAG_o (1<<25)
-#define FLAG_g (1<<26)
-#define FLAG_Z (1<<27)
-#define FLAG_color (1<<28)
+#define FLAG_b (1<<17)
+#define FLAG_a (1<<18)
+#define FLAG_S (1<<19)
+#define FLAG_R (1<<20)
+#define FLAG_L (1<<21)
+#define FLAG_H (1<<22)
+#define FLAG_F (1<<23)
+#define FLAG_C (1<<24)
+#define FLAG_A (1<<25)
+#define FLAG_o (1<<26)
+#define FLAG_g (1<<27)
+#define FLAG_Z (1<<28)
+#define FLAG_color (1<<29)
 #endif
 
 #ifdef FOR_lsattr
@@ -3963,7 +4307,8 @@
 #ifndef TT
 #define TT this.md5sum
 #endif
-#define FLAG_b (1<<0)
+#define FLAG_c (1<<0)
+#define FLAG_b (1<<1)
 #endif
 
 #ifdef FOR_mdev
@@ -4037,6 +4382,7 @@
 #ifndef TT
 #define TT this.mkswap
 #endif
+#define FLAG_L (1<<0)
 #endif
 
 #ifdef FOR_mktemp
@@ -4048,6 +4394,7 @@
 #define FLAG_directory (1<<1)
 #define FLAG_d (1<<1)
 #define FLAG_q (1<<2)
+#define FLAG_u (1<<3)
 #endif
 
 #ifdef FOR_modinfo
@@ -4110,6 +4457,7 @@
 #endif
 #define FLAG_i (1<<0)
 #define FLAG_f (1<<1)
+#define FLAG_remove_destination (1<<2)
 #define FLAG_F (1<<2)
 #define FLAG_n (1<<3)
 #define FLAG_v (1<<4)
@@ -4222,8 +4570,9 @@
 #define FLAG_s (1<<6)
 #define FLAG_x (1<<7)
 #define FLAG_N (1<<8)
-#define FLAG_v (1<<9)
-#define FLAG_j (1<<10)
+#define FLAG_w (1<<9)
+#define FLAG_v (1<<10)
+#define FLAG_j (1<<11)
 #endif
 
 #ifdef FOR_oneit
@@ -4278,21 +4627,31 @@
 #define FLAG_p (1<<2)
 #define FLAG_l (1<<3)
 #define FLAG_u (1<<4)
-#define FLAG_x (FORCED_FLAG<<5)
+#define FLAG_d (1<<5)
+#define FLAG_x (FORCED_FLAG<<6)
+#define FLAG_dry_run (1<<7)
 #endif
 
 #ifdef FOR_pgrep
 #ifndef TT
 #define TT this.pgrep
 #endif
-#define FLAG_f (1<<0)
-#define FLAG_l (1<<1)
-#define FLAG_n (1<<2)
+#define FLAG_L (1<<0)
+#define FLAG_x (1<<1)
+#define FLAG_v (1<<2)
 #define FLAG_o (1<<3)
-#define FLAG_v (1<<4)
-#define FLAG_x (1<<5)
-#define FLAG_s (1<<6)
-#define FLAG_P (1<<7)
+#define FLAG_n (1<<4)
+#define FLAG_f (1<<5)
+#define FLAG_G (1<<6)
+#define FLAG_g (1<<7)
+#define FLAG_P (1<<8)
+#define FLAG_s (1<<9)
+#define FLAG_t (1<<10)
+#define FLAG_U (1<<11)
+#define FLAG_u (1<<12)
+#define FLAG_d (1<<13)
+#define FLAG_l (1<<14)
+#define FLAG_c (1<<15)
 #endif
 
 #ifdef FOR_pidof
@@ -4324,6 +4683,26 @@
 #endif
 #endif
 
+#ifdef FOR_pkill
+#ifndef TT
+#define TT this.pkill
+#endif
+#define FLAG_l (1<<0)
+#define FLAG_x (1<<1)
+#define FLAG_v (1<<2)
+#define FLAG_o (1<<3)
+#define FLAG_n (1<<4)
+#define FLAG_f (1<<5)
+#define FLAG_G (1<<6)
+#define FLAG_g (1<<7)
+#define FLAG_P (1<<8)
+#define FLAG_s (1<<9)
+#define FLAG_t (1<<10)
+#define FLAG_U (1<<11)
+#define FLAG_u (1<<12)
+#define FLAG_V (1<<13)
+#endif
+
 #ifdef FOR_pmap
 #ifndef TT
 #define TT this.pmap
@@ -4356,18 +4735,25 @@
 #define FLAG_g (1<<3)
 #define FLAG_U (1<<4)
 #define FLAG_u (1<<5)
-#define FLAG_t (1<<6)
-#define FLAG_s (1<<7)
-#define FLAG_pid (1<<8)
-#define FLAG_p (1<<8)
-#define FLAG_o (1<<9)
-#define FLAG_l (1<<10)
-#define FLAG_f (1<<11)
-#define FLAG_e (1<<12)
-#define FLAG_d (1<<13)
-#define FLAG_A (1<<14)
-#define FLAG_a (1<<15)
-#define FLAG_ppid (1<<16)
+#define FLAG_T (1<<6)
+#define FLAG_t (1<<7)
+#define FLAG_s (1<<8)
+#define FLAG_pid (1<<9)
+#define FLAG_p (1<<9)
+#define FLAG_O (1<<10)
+#define FLAG_o (1<<11)
+#define FLAG_n (1<<12)
+#define FLAG_M (1<<13)
+#define FLAG_l (1<<14)
+#define FLAG_f (1<<15)
+#define FLAG_e (1<<16)
+#define FLAG_d (1<<17)
+#define FLAG_A (1<<18)
+#define FLAG_a (1<<19)
+#define FLAG_ppid (1<<20)
+#define FLAG_P (1<<20)
+#define FLAG_sort (1<<21)
+#define FLAG_k (1<<21)
 #endif
 
 #ifdef FOR_pwd
@@ -4484,9 +4870,9 @@
 #ifndef TT
 #define TT this.route
 #endif
-#define FLAG_A (1<<0)
-#define FLAG_e (1<<1)
-#define FLAG_n (1<<2)
+#define FLAG_A (FORCED_FLAG<<0)
+#define FLAG_e (FORCED_FLAG<<1)
+#define FLAG_n (FORCED_FLAG<<2)
 #endif
 
 #ifdef FOR_runcon
@@ -4508,12 +4894,19 @@
 #define FLAG_version (1<<6)
 #endif
 
+#ifdef FOR_sendevent
+#ifndef TT
+#define TT this.sendevent
+#endif
+#endif
+
 #ifdef FOR_seq
 #ifndef TT
 #define TT this.seq
 #endif
-#define FLAG_s (1<<0)
-#define FLAG_f (1<<1)
+#define FLAG_w (1<<0)
+#define FLAG_s (1<<1)
+#define FLAG_f (1<<2)
 #endif
 
 #ifdef FOR_setenforce
@@ -4547,7 +4940,8 @@
 #ifndef TT
 #define TT this.sha1sum
 #endif
-#define FLAG_b (1<<0)
+#define FLAG_c (1<<0)
+#define FLAG_b (1<<1)
 #endif
 
 #ifdef FOR_shred
@@ -4626,12 +5020,26 @@
 #define FLAG_a (1<<2)
 #endif
 
+#ifdef FOR_start
+#ifndef TT
+#define TT this.start
+#endif
+#endif
+
 #ifdef FOR_stat
 #ifndef TT
 #define TT this.stat
 #endif
-#define FLAG_f (1<<0)
-#define FLAG_c (1<<1)
+#define FLAG_t (1<<0)
+#define FLAG_L (1<<1)
+#define FLAG_f (1<<2)
+#define FLAG_c (1<<3)
+#endif
+
+#ifdef FOR_stop
+#ifndef TT
+#define TT this.stop
+#endif
 #endif
 
 #ifdef FOR_strings
@@ -4672,15 +5080,16 @@
 #ifndef TT
 #define TT this.swapon
 #endif
-#define FLAG_p (1<<0)
+#define FLAG_d (1<<0)
+#define FLAG_p (1<<1)
 #endif
 
 #ifdef FOR_switch_root
 #ifndef TT
 #define TT this.switch_root
 #endif
-#define FLAG_h (1<<0)
-#define FLAG_c (1<<1)
+#define FLAG_h (FORCED_FLAG<<0)
+#define FLAG_c (FORCED_FLAG<<1)
 #endif
 
 #ifdef FOR_sync
@@ -4846,6 +5255,70 @@
 #define FLAG_i (FORCED_FLAG<<2)
 #endif
 
+#ifdef FOR_test_many_options
+#ifndef TT
+#define TT this.test_many_options
+#endif
+#define FLAG_a (FORCED_FLAG<<0)
+#define FLAG_b (FORCED_FLAG<<1)
+#define FLAG_c (FORCED_FLAG<<2)
+#define FLAG_d (FORCED_FLAG<<3)
+#define FLAG_e (FORCED_FLAG<<4)
+#define FLAG_f (FORCED_FLAG<<5)
+#define FLAG_g (FORCED_FLAG<<6)
+#define FLAG_h (FORCED_FLAG<<7)
+#define FLAG_i (FORCED_FLAG<<8)
+#define FLAG_j (FORCED_FLAG<<9)
+#define FLAG_k (FORCED_FLAG<<10)
+#define FLAG_l (FORCED_FLAG<<11)
+#define FLAG_m (FORCED_FLAG<<12)
+#define FLAG_n (FORCED_FLAG<<13)
+#define FLAG_o (FORCED_FLAG<<14)
+#define FLAG_p (FORCED_FLAG<<15)
+#define FLAG_q (FORCED_FLAG<<16)
+#define FLAG_r (FORCED_FLAG<<17)
+#define FLAG_s (FORCED_FLAG<<18)
+#define FLAG_t (FORCED_FLAG<<19)
+#define FLAG_u (FORCED_FLAG<<20)
+#define FLAG_v (FORCED_FLAG<<21)
+#define FLAG_w (FORCED_FLAG<<22)
+#define FLAG_x (FORCED_FLAG<<23)
+#define FLAG_y (FORCED_FLAG<<24)
+#define FLAG_z (FORCED_FLAG<<25)
+#define FLAG_A (FORCED_FLAG<<26)
+#define FLAG_B (FORCED_FLAG<<27)
+#define FLAG_C (FORCED_FLAG<<28)
+#define FLAG_D (FORCED_FLAG<<29)
+#define FLAG_E (FORCED_FLAG<<30)
+#define FLAG_F (FORCED_FLAG<<31)
+#define FLAG_G (FORCED_FLAGLL<<32)
+#define FLAG_H (FORCED_FLAGLL<<33)
+#define FLAG_I (FORCED_FLAGLL<<34)
+#define FLAG_J (FORCED_FLAGLL<<35)
+#define FLAG_K (FORCED_FLAGLL<<36)
+#define FLAG_L (FORCED_FLAGLL<<37)
+#define FLAG_M (FORCED_FLAGLL<<38)
+#define FLAG_N (FORCED_FLAGLL<<39)
+#define FLAG_O (FORCED_FLAGLL<<40)
+#define FLAG_P (FORCED_FLAGLL<<41)
+#define FLAG_Q (FORCED_FLAGLL<<42)
+#define FLAG_R (FORCED_FLAGLL<<43)
+#define FLAG_S (FORCED_FLAGLL<<44)
+#define FLAG_T (FORCED_FLAGLL<<45)
+#define FLAG_U (FORCED_FLAGLL<<46)
+#define FLAG_V (FORCED_FLAGLL<<47)
+#define FLAG_W (FORCED_FLAGLL<<48)
+#define FLAG_X (FORCED_FLAGLL<<49)
+#define FLAG_Y (FORCED_FLAGLL<<50)
+#define FLAG_Z (FORCED_FLAGLL<<51)
+#endif
+
+#ifdef FOR_test_scankey
+#ifndef TT
+#define TT this.test_scankey
+#endif
+#endif
+
 #ifdef FOR_tftp
 #ifndef TT
 #define TT this.tftp
@@ -4887,10 +5360,18 @@
 #ifndef TT
 #define TT this.top
 #endif
-#define FLAG_b (1<<0)
-#define FLAG_m (1<<1)
+#define FLAG_q (1<<0)
+#define FLAG_b (1<<1)
 #define FLAG_n (1<<2)
 #define FLAG_d (1<<3)
+#define FLAG_s (1<<4)
+#define FLAG_u (1<<5)
+#define FLAG_p (1<<6)
+#define FLAG_o (1<<7)
+#define FLAG_k (1<<8)
+#define FLAG_H (1<<9)
+#define FLAG_O (1<<10)
+#define FLAG_m (1<<11)
 #endif
 
 #ifdef FOR_touch
@@ -4969,6 +5450,32 @@
 #define FLAG_s (1<<0)
 #endif
 
+#ifdef FOR_ulimit
+#ifndef TT
+#define TT this.ulimit
+#endif
+#define FLAG_c (1<<0)
+#define FLAG_d (1<<1)
+#define FLAG_e (1<<2)
+#define FLAG_f (1<<3)
+#define FLAG_i (1<<4)
+#define FLAG_l (1<<5)
+#define FLAG_m (1<<6)
+#define FLAG_n (1<<7)
+#define FLAG_p (1<<8)
+#define FLAG_q (1<<9)
+#define FLAG_R (1<<10)
+#define FLAG_r (1<<11)
+#define FLAG_s (1<<12)
+#define FLAG_t (1<<13)
+#define FLAG_u (1<<14)
+#define FLAG_v (1<<15)
+#define FLAG_a (1<<16)
+#define FLAG_H (1<<17)
+#define FLAG_S (1<<18)
+#define FLAG_P (1<<19)
+#endif
+
 #ifdef FOR_umount
 #ifndef TT
 #define TT this.umount
@@ -5027,13 +5534,22 @@
 #ifndef TT
 #define TT this.unshare
 #endif
+#define FLAG_user (FORCED_FLAG<<0)
 #define FLAG_U (FORCED_FLAG<<0)
+#define FLAG_uts (FORCED_FLAG<<1)
 #define FLAG_u (FORCED_FLAG<<1)
+#define FLAG_pid (FORCED_FLAG<<2)
 #define FLAG_p (FORCED_FLAG<<2)
+#define FLAG_net (FORCED_FLAG<<3)
 #define FLAG_n (FORCED_FLAG<<3)
+#define FLAG_mount (FORCED_FLAG<<4)
 #define FLAG_m (FORCED_FLAG<<4)
+#define FLAG_ipc (FORCED_FLAG<<5)
 #define FLAG_i (FORCED_FLAG<<5)
+#define FLAG_map_root_user (FORCED_FLAG<<6)
 #define FLAG_r (FORCED_FLAG<<6)
+#define FLAG_fork (FORCED_FLAG<<7)
+#define FLAG_f (FORCED_FLAG<<7)
 #endif
 
 #ifdef FOR_uptime
@@ -5089,6 +5605,12 @@
 #endif
 #endif
 
+#ifdef FOR_vi
+#ifndef TT
+#define TT this.vi
+#endif
+#endif
+
 #ifdef FOR_vmstat
 #ifndef TT
 #define TT this.vmstat
@@ -5121,6 +5643,13 @@
 #define FLAG_m (1<<3)
 #endif
 
+#ifdef FOR_wget
+#ifndef TT
+#define TT this.wget
+#endif
+#define FLAG_f (FORCED_FLAG<<0)
+#endif
+
 #ifdef FOR_which
 #ifndef TT
 #define TT this.which
@@ -5155,9 +5684,12 @@
 #ifndef TT
 #define TT this.xxd
 #endif
-#define FLAG_g (1<<0)
-#define FLAG_l (1<<1)
-#define FLAG_c (1<<2)
+#define FLAG_s (1<<0)
+#define FLAG_r (1<<1)
+#define FLAG_p (1<<2)
+#define FLAG_g (1<<3)
+#define FLAG_l (1<<4)
+#define FLAG_c (1<<5)
 #endif
 
 #ifdef FOR_xzcat