diff options
| author | Pádraig Brady <P@draigBrady.com> | 2019-01-29 20:32:53 -0800 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2019-02-03 17:18:08 -0800 |
| commit | 2e8f885a2a853fea0ef56b663741c0947f9ba7ca (patch) | |
| tree | d363c09dbc212036da6828497ce8d7d3e9ab837b /src/stat.c | |
| parent | 90933c8eb0efc2a718fae44a22e89fc4e0f49cc9 (diff) | |
| download | coreutils-2e8f885a2a853fea0ef56b663741c0947f9ba7ca.tar.gz | |
stat,tail: fix android build and support inotify
* src/extract-magic: Treat android like linux,
which fixes the build by ensuring the constants are defined.
* src/stat.c: Support all constants on android, including
the android specific "sdcardfs".
* src/tail.c: Fix inclusion of statfs headers to be independent
of inotify availability, as fremote() is used on linux even
if inotify has been disabled. Also enable fremote() on android.
* NEWS: Mention the improvment.
Fixes https://bugs.gnu.org/34239
Diffstat (limited to 'src/stat.c')
| -rw-r--r-- | src/stat.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/stat.c b/src/stat.c index f17246d30..c8f180948 100644 --- a/src/stat.c +++ b/src/stat.c @@ -235,7 +235,7 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) #else switch (statfsbuf->f_type) { -# if defined __linux__ +# if defined __linux__ || defined __ANDROID__ /* Compare with what's in libc: f=/a/libc/sysdeps/unix/sysv/linux/linux_fsinfo.h @@ -450,6 +450,8 @@ human_fstype (STRUCT_STATVFS const *statfsbuf) return "romfs"; case S_MAGIC_RPC_PIPEFS: /* 0x67596969 local */ return "rpc_pipefs"; + case S_MAGIC_SDCARDFS: /* 0x5DCA2DF5 local */ + return "sdcardfs"; case S_MAGIC_SECURITYFS: /* 0x73636673 local */ return "securityfs"; case S_MAGIC_SELINUX: /* 0xF97CFF8C local */ |