Used /proc/mounts for checking existing mounts

The file /etc/mtab is traditionally checked to avoid multiple mountings
of the same device, but this is not accurate enough in some conditions.
So use /proc/mounts when available and fall back to /etc/mtab on
systems which do not have /proc/mounts.

diff --git a/libntfs-3g/volume.c b/libntfs-3g/volume.c
index 5bb266f..edd7697 100644 (file)
--- a/libntfs-3g/volume.c
+++ b/libntfs-3g/volume.c
@@ -1433,7 +1433,8 @@ static int ntfs_mntent_check(const char *file, unsigned long *mnt_flags)
                err = errno;
                goto exit;
        }
-       if (!(f = setmntent(MOUNTED, "r"))) {
+       f = setmntent("/proc/mounts", "r");
+       if (!f && !(f = setmntent(MOUNTED, "r"))) {
                err = errno;
                goto exit;
        }