summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthat <github@that.at>2015-12-07 21:12:48 +0100
committerDees Troy <dees_troy@teamw.in>2015-12-19 15:45:33 +0100
commit58a413380c1eefa16a599600721eafaa4c6709a1 (patch)
tree7cc433862f3b09f67541ffc124e4a450b78973f8
parentUse ioctl to get block device size (diff)
downloadandroid_bootable_recovery-58a413380c1eefa16a599600721eafaa4c6709a1.tar
android_bootable_recovery-58a413380c1eefa16a599600721eafaa4c6709a1.tar.gz
android_bootable_recovery-58a413380c1eefa16a599600721eafaa4c6709a1.tar.bz2
android_bootable_recovery-58a413380c1eefa16a599600721eafaa4c6709a1.tar.lz
android_bootable_recovery-58a413380c1eefa16a599600721eafaa4c6709a1.tar.xz
android_bootable_recovery-58a413380c1eefa16a599600721eafaa4c6709a1.tar.zst
android_bootable_recovery-58a413380c1eefa16a599600721eafaa4c6709a1.zip
-rw-r--r--dosfstools/src/mkfs.fat.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/dosfstools/src/mkfs.fat.c b/dosfstools/src/mkfs.fat.c
index f6c6519d0..2dad23630 100644
--- a/dosfstools/src/mkfs.fat.c
+++ b/dosfstools/src/mkfs.fat.c
@@ -498,6 +498,8 @@ static uint64_t count_blocks(char *filename, int *remainder)
static void check_mount(char *device_name)
{
+/* older versions of Bionic don't have setmntent (4.x) or an incomplete impl (5.x) */
+#ifdef MOUNTED
FILE *f;
struct mntent *mnt;
@@ -507,6 +509,7 @@ static void check_mount(char *device_name)
if (strcmp(device_name, mnt->mnt_fsname) == 0)
die("%s contains a mounted filesystem.");
endmntent(f);
+#endif
}
/* Establish the geometry and media parameters for the device */