diff options
| author | Elliott Hughes <enh@google.com> | 2018-12-05 13:07:39 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2018-12-05 13:07:39 -0800 |
| commit | b5744abfe5993c728b338b5f357f8af274769d9d (patch) | |
| tree | abe69188c3871ac849f9a23b08f8f464e9ba8c8d /generated | |
| parent | ced4a43b5f077f60036994a6c40e4daaec007f5e (diff) | |
| download | toybox-b5744abfe5993c728b338b5f357f8af274769d9d.tar.gz | |
Add getconf(1), iconv(1), nproc(1), and watch(1).
Test: builds
Change-Id: Ibb928136d1c4111303ca04437caac06f7ac558d2
Diffstat (limited to 'generated')
| -rw-r--r-- | generated/config.h | 16 | ||||
| -rw-r--r-- | generated/flags.h | 32 |
2 files changed, 24 insertions, 24 deletions
diff --git a/generated/config.h b/generated/config.h index 97949ef3..b5cc9653 100644 --- a/generated/config.h +++ b/generated/config.h @@ -220,8 +220,8 @@ #define USE_FTPGET(...) #define CFG_FTPPUT 0 #define USE_FTPPUT(...) -#define CFG_GETCONF 0 -#define USE_GETCONF(...) +#define CFG_GETCONF 1 +#define USE_GETCONF(...) __VA_ARGS__ #define CFG_GETENFORCE 1 #define USE_GETENFORCE(...) __VA_ARGS__ #define CFG_GETFATTR 1 @@ -268,8 +268,8 @@ #define USE_I2CGET(...) __VA_ARGS__ #define CFG_I2CSET 1 #define USE_I2CSET(...) __VA_ARGS__ -#define CFG_ICONV 0 -#define USE_ICONV(...) +#define CFG_ICONV 1 +#define USE_ICONV(...) __VA_ARGS__ #define CFG_ID 1 #define USE_ID(...) __VA_ARGS__ #define CFG_ID_Z 1 @@ -412,8 +412,8 @@ #define USE_NL(...) __VA_ARGS__ #define CFG_NOHUP 1 #define USE_NOHUP(...) __VA_ARGS__ -#define CFG_NPROC 0 -#define USE_NPROC(...) +#define CFG_NPROC 1 +#define USE_NPROC(...) __VA_ARGS__ #define CFG_NSENTER 1 #define USE_NSENTER(...) __VA_ARGS__ #define CFG_OD 1 @@ -634,8 +634,8 @@ #define USE_VI(...) #define CFG_VMSTAT 1 #define USE_VMSTAT(...) __VA_ARGS__ -#define CFG_WATCH 0 -#define USE_WATCH(...) +#define CFG_WATCH 1 +#define USE_WATCH(...) __VA_ARGS__ #define CFG_WC 1 #define USE_WC(...) __VA_ARGS__ #define CFG_WGET 0 diff --git a/generated/flags.h b/generated/flags.h index 5470c1a7..e3515fc2 100644 --- a/generated/flags.h +++ b/generated/flags.h @@ -981,7 +981,7 @@ #undef FLAG_P #endif -// getconf >2al +// getconf >2al >2al #undef OPTSTR_getconf #define OPTSTR_getconf ">2al" #ifdef CLEANUP_getconf @@ -1282,7 +1282,7 @@ #undef FLAG_f #endif -// iconv cst:f: +// iconv cst:f: cst:f: #undef OPTSTR_iconv #define OPTSTR_iconv "cst:f:" #ifdef CLEANUP_iconv @@ -1969,7 +1969,7 @@ #undef FOR_nohup #endif -// nproc (all) +// nproc (all) (all) #undef OPTSTR_nproc #define OPTSTR_nproc "(all)" #ifdef CLEANUP_nproc @@ -3246,7 +3246,7 @@ #undef FOR_w #endif -// watch ^<1n%<100=2000tebx +// watch ^<1n%<100=2000tebx ^<1n%<100=2000tebx #undef OPTSTR_watch #define OPTSTR_watch "^<1n%<100=2000tebx" #ifdef CLEANUP_watch @@ -4198,8 +4198,8 @@ #ifndef TT #define TT this.getconf #endif -#define FLAG_l (FORCED_FLAG<<0) -#define FLAG_a (FORCED_FLAG<<1) +#define FLAG_l (1<<0) +#define FLAG_a (1<<1) #endif #ifdef FOR_getenforce @@ -4453,10 +4453,10 @@ #ifndef TT #define TT this.iconv #endif -#define FLAG_f (FORCED_FLAG<<0) -#define FLAG_t (FORCED_FLAG<<1) -#define FLAG_s (FORCED_FLAG<<2) -#define FLAG_c (FORCED_FLAG<<3) +#define FLAG_f (1<<0) +#define FLAG_t (1<<1) +#define FLAG_s (1<<2) +#define FLAG_c (1<<3) #endif #ifdef FOR_id @@ -5028,7 +5028,7 @@ #ifndef TT #define TT this.nproc #endif -#define FLAG_all (FORCED_FLAG<<0) +#define FLAG_all (1<<0) #endif #ifdef FOR_nsenter @@ -6101,11 +6101,11 @@ #ifndef TT #define TT this.watch #endif -#define FLAG_x (FORCED_FLAG<<0) -#define FLAG_b (FORCED_FLAG<<1) -#define FLAG_e (FORCED_FLAG<<2) -#define FLAG_t (FORCED_FLAG<<3) -#define FLAG_n (FORCED_FLAG<<4) +#define FLAG_x (1<<0) +#define FLAG_b (1<<1) +#define FLAG_e (1<<2) +#define FLAG_t (1<<3) +#define FLAG_n (1<<4) #endif #ifdef FOR_wc |