diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-28 16:23:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-28 16:23:43 +0000 |
| commit | 9f203e8e4912f4122b7b5ae7d4db2b1ce1718029 (patch) | |
| tree | ac392dd35b820a5838a5f4e03ba02b9cdccacf02 | |
| parent | 33206140185ac27d7078e13debf8e116d09b37d0 (diff) | |
| parent | 250a80c9dcdf5a310659c5820acc07564ba8f86d (diff) | |
| download | toybox-9f203e8e4912f4122b7b5ae7d4db2b1ce1718029.tar.gz | |
Enable zcat in the host toybox. am: 250a80c9dc
Change-Id: I7bc357f0cc2f3b0e6fd83d2c3bee1ab11868cdfd
| -rw-r--r-- | .config-linux | 2 | ||||
| -rw-r--r-- | .config-mac | 2 | ||||
| -rw-r--r-- | android/linux/generated/config.h | 4 | ||||
| -rw-r--r-- | android/linux/generated/flags.h | 28 | ||||
| -rw-r--r-- | android/mac/generated/config.h | 4 | ||||
| -rw-r--r-- | android/mac/generated/flags.h | 28 |
6 files changed, 34 insertions, 34 deletions
diff --git a/.config-linux b/.config-linux index 339a99d6..53477923 100644 --- a/.config-linux +++ b/.config-linux @@ -336,4 +336,4 @@ CONFIG_XARGS=y CONFIG_XXD=y # CONFIG_XZCAT is not set # CONFIG_YES is not set -# CONFIG_ZCAT is not set +CONFIG_ZCAT=y diff --git a/.config-mac b/.config-mac index bf601ada..00d838cb 100644 --- a/.config-mac +++ b/.config-mac @@ -336,4 +336,4 @@ CONFIG_XARGS=y CONFIG_XXD=y # CONFIG_XZCAT is not set # CONFIG_YES is not set -# CONFIG_ZCAT is not set +CONFIG_ZCAT=y diff --git a/android/linux/generated/config.h b/android/linux/generated/config.h index 0e65aaea..7fdfaeb9 100644 --- a/android/linux/generated/config.h +++ b/android/linux/generated/config.h @@ -646,5 +646,5 @@ #define USE_XZCAT(...) #define CFG_YES 0 #define USE_YES(...) -#define CFG_ZCAT 0 -#define USE_ZCAT(...) +#define CFG_ZCAT 1 +#define USE_ZCAT(...) __VA_ARGS__ diff --git a/android/linux/generated/flags.h b/android/linux/generated/flags.h index ec5ceb0a..63c91821 100644 --- a/android/linux/generated/flags.h +++ b/android/linux/generated/flags.h @@ -3403,7 +3403,7 @@ #undef FOR_yes #endif -// zcat cdfk123456789[-123456789] +// zcat cdfk123456789[-123456789] cdfk123456789[-123456789] #undef OPTSTR_zcat #define OPTSTR_zcat "cdfk123456789[-123456789]" #ifdef CLEANUP_zcat @@ -6285,18 +6285,18 @@ #ifndef TT #define TT this.zcat #endif -#define FLAG_9 (FORCED_FLAG<<0) -#define FLAG_8 (FORCED_FLAG<<1) -#define FLAG_7 (FORCED_FLAG<<2) -#define FLAG_6 (FORCED_FLAG<<3) -#define FLAG_5 (FORCED_FLAG<<4) -#define FLAG_4 (FORCED_FLAG<<5) -#define FLAG_3 (FORCED_FLAG<<6) -#define FLAG_2 (FORCED_FLAG<<7) -#define FLAG_1 (FORCED_FLAG<<8) -#define FLAG_k (FORCED_FLAG<<9) -#define FLAG_f (FORCED_FLAG<<10) -#define FLAG_d (FORCED_FLAG<<11) -#define FLAG_c (FORCED_FLAG<<12) +#define FLAG_9 (1<<0) +#define FLAG_8 (1<<1) +#define FLAG_7 (1<<2) +#define FLAG_6 (1<<3) +#define FLAG_5 (1<<4) +#define FLAG_4 (1<<5) +#define FLAG_3 (1<<6) +#define FLAG_2 (1<<7) +#define FLAG_1 (1<<8) +#define FLAG_k (1<<9) +#define FLAG_f (1<<10) +#define FLAG_d (1<<11) +#define FLAG_c (1<<12) #endif diff --git a/android/mac/generated/config.h b/android/mac/generated/config.h index 0a08be9c..07b3de56 100644 --- a/android/mac/generated/config.h +++ b/android/mac/generated/config.h @@ -646,5 +646,5 @@ #define USE_XZCAT(...) #define CFG_YES 0 #define USE_YES(...) -#define CFG_ZCAT 0 -#define USE_ZCAT(...) +#define CFG_ZCAT 1 +#define USE_ZCAT(...) __VA_ARGS__ diff --git a/android/mac/generated/flags.h b/android/mac/generated/flags.h index 018ba654..81598978 100644 --- a/android/mac/generated/flags.h +++ b/android/mac/generated/flags.h @@ -3403,7 +3403,7 @@ #undef FOR_yes #endif -// zcat cdfk123456789[-123456789] +// zcat cdfk123456789[-123456789] cdfk123456789[-123456789] #undef OPTSTR_zcat #define OPTSTR_zcat "cdfk123456789[-123456789]" #ifdef CLEANUP_zcat @@ -6285,18 +6285,18 @@ #ifndef TT #define TT this.zcat #endif -#define FLAG_9 (FORCED_FLAG<<0) -#define FLAG_8 (FORCED_FLAG<<1) -#define FLAG_7 (FORCED_FLAG<<2) -#define FLAG_6 (FORCED_FLAG<<3) -#define FLAG_5 (FORCED_FLAG<<4) -#define FLAG_4 (FORCED_FLAG<<5) -#define FLAG_3 (FORCED_FLAG<<6) -#define FLAG_2 (FORCED_FLAG<<7) -#define FLAG_1 (FORCED_FLAG<<8) -#define FLAG_k (FORCED_FLAG<<9) -#define FLAG_f (FORCED_FLAG<<10) -#define FLAG_d (FORCED_FLAG<<11) -#define FLAG_c (FORCED_FLAG<<12) +#define FLAG_9 (1<<0) +#define FLAG_8 (1<<1) +#define FLAG_7 (1<<2) +#define FLAG_6 (1<<3) +#define FLAG_5 (1<<4) +#define FLAG_4 (1<<5) +#define FLAG_3 (1<<6) +#define FLAG_2 (1<<7) +#define FLAG_1 (1<<8) +#define FLAG_k (1<<9) +#define FLAG_f (1<<10) +#define FLAG_d (1<<11) +#define FLAG_c (1<<12) #endif |