Add file(1) to the host toybox. am: 75da6e6f8e am: 4fb4598922 am: d3906712e3 am: bb0fd84453
Original change: https://android-review.googlesource.com/c/platform/external/toybox/+/2538753
Change-Id: Ib5b89cb2aee71e94fb658d372e43d7073ab69e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/.config-linux b/.config-linux
index e5e2e3d..73e55ac 100644
--- a/.config-linux
+++ b/.config-linux
@@ -99,7 +99,7 @@
# 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 95c9df1..6ff9493 100644
--- a/.config-mac
+++ b/.config-mac
@@ -99,7 +99,7 @@
# 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/Android.bp b/Android.bp
index 9912fe8..f6a0610 100644
--- a/Android.bp
+++ b/Android.bp
@@ -98,6 +98,7 @@
"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 @@
"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 dd4eac5..a1d03da 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 e852aa9..3e550a7 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 5c19a59..bd4c09b 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 5d7e2e9..0cb1833 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
