diff options
| author | Elliott Hughes <enh@google.com> | 2023-04-14 22:23:02 +0000 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2023-04-14 22:23:02 +0000 |
| commit | 75da6e6f8eee25fae9b1479b5cd2f5a2e0b57788 (patch) | |
| tree | 6fe35b6a51bd85a90b3a84e2ad013347e17026a3 | |
| parent | 88cd220c06e2423ec36dea00f529a91a59c873b6 (diff) | |
| download | toybox-75da6e6f8eee25fae9b1479b5cd2f5a2e0b57788.tar.gz | |
Add file(1) to the host toybox.
Desired for the hermetic rustc toolchain build.
Test: treehugger
Change-Id: I1777e00d10b106951507442b29ddadf2a7d5e81b
| -rw-r--r-- | .config-linux | 2 | ||||
| -rw-r--r-- | .config-mac | 2 | ||||
| -rw-r--r-- | Android.bp | 2 | ||||
| -rw-r--r-- | android/linux/generated/config.h | 4 | ||||
| -rw-r--r-- | android/linux/generated/flags.h | 10 | ||||
| -rw-r--r-- | android/mac/generated/config.h | 4 | ||||
| -rw-r--r-- | android/mac/generated/flags.h | 10 |
7 files changed, 17 insertions, 17 deletions
diff --git a/.config-linux b/.config-linux index e5e2e3da..73e55ac9 100644 --- a/.config-linux +++ b/.config-linux @@ -99,7 +99,7 @@ CONFIG_EXPR=y # CONFIG_FALSE is not set # CONFIG_FDISK is not set CONFIG_FGREP=y -# CONFIG_FILE is not set +CONFIG_FILE=y CONFIG_FIND=y # CONFIG_FLOCK is not set # CONFIG_FMT is not set diff --git a/.config-mac b/.config-mac index 95c9df13..6ff9493a 100644 --- a/.config-mac +++ b/.config-mac @@ -99,7 +99,7 @@ CONFIG_EXPR=y # CONFIG_FALSE is not set # CONFIG_FDISK is not set CONFIG_FGREP=y -# CONFIG_FILE is not set +CONFIG_FILE=y CONFIG_FIND=y # CONFIG_FLOCK is not set # CONFIG_FMT is not set @@ -98,6 +98,7 @@ all_srcs = [ "toys/posix/du.c", "toys/posix/echo.c", "toys/posix/env.c", + "toys/posix/file.c", "toys/posix/find.c", "toys/posix/getconf.c", "toys/posix/grep.c", @@ -223,7 +224,6 @@ device_srcs = [ "toys/posix/df.c", "toys/posix/expand.c", "toys/posix/false.c", - "toys/posix/file.c", "toys/posix/iconv.c", "toys/posix/kill.c", "toys/posix/logger.c", diff --git a/android/linux/generated/config.h b/android/linux/generated/config.h index dd4eac50..a1d03da5 100644 --- a/android/linux/generated/config.h +++ b/android/linux/generated/config.h @@ -172,8 +172,8 @@ #define USE_FDISK(...) #define CFG_FGREP 1 #define USE_FGREP(...) __VA_ARGS__ -#define CFG_FILE 0 -#define USE_FILE(...) +#define CFG_FILE 1 +#define USE_FILE(...) __VA_ARGS__ #define CFG_FIND 1 #define USE_FIND(...) __VA_ARGS__ #define CFG_FLOCK 0 diff --git a/android/linux/generated/flags.h b/android/linux/generated/flags.h index e852aa97..3e550a7e 100644 --- a/android/linux/generated/flags.h +++ b/android/linux/generated/flags.h @@ -934,7 +934,7 @@ #undef FLAG_C #endif -// file <1b(brief)hLs[!hL] +// file <1b(brief)hLs[!hL] <1b(brief)hLs[!hL] #undef OPTSTR_file #define OPTSTR_file "<1b(brief)hLs[!hL]" #ifdef CLEANUP_file @@ -4716,10 +4716,10 @@ #ifndef TT #define TT this.file #endif -#define FLAG_s (FORCED_FLAG<<0) -#define FLAG_L (FORCED_FLAG<<1) -#define FLAG_h (FORCED_FLAG<<2) -#define FLAG_b (FORCED_FLAG<<3) +#define FLAG_s (1LL<<0) +#define FLAG_L (1LL<<1) +#define FLAG_h (1LL<<2) +#define FLAG_b (1LL<<3) #endif #ifdef FOR_find diff --git a/android/mac/generated/config.h b/android/mac/generated/config.h index 5c19a594..bd4c09b7 100644 --- a/android/mac/generated/config.h +++ b/android/mac/generated/config.h @@ -172,8 +172,8 @@ #define USE_FDISK(...) #define CFG_FGREP 1 #define USE_FGREP(...) __VA_ARGS__ -#define CFG_FILE 0 -#define USE_FILE(...) +#define CFG_FILE 1 +#define USE_FILE(...) __VA_ARGS__ #define CFG_FIND 1 #define USE_FIND(...) __VA_ARGS__ #define CFG_FLOCK 0 diff --git a/android/mac/generated/flags.h b/android/mac/generated/flags.h index 5d7e2e94..0cb1833c 100644 --- a/android/mac/generated/flags.h +++ b/android/mac/generated/flags.h @@ -934,7 +934,7 @@ #undef FLAG_C #endif -// file <1b(brief)hLs[!hL] +// file <1b(brief)hLs[!hL] <1b(brief)hLs[!hL] #undef OPTSTR_file #define OPTSTR_file "<1b(brief)hLs[!hL]" #ifdef CLEANUP_file @@ -4716,10 +4716,10 @@ #ifndef TT #define TT this.file #endif -#define FLAG_s (FORCED_FLAG<<0) -#define FLAG_L (FORCED_FLAG<<1) -#define FLAG_h (FORCED_FLAG<<2) -#define FLAG_b (FORCED_FLAG<<3) +#define FLAG_s (1LL<<0) +#define FLAG_L (1LL<<1) +#define FLAG_h (1LL<<2) +#define FLAG_b (1LL<<3) #endif #ifdef FOR_find |