From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 28 Jun 2002 01:19:45 +0000 (-0400)
Subject: ismounted.c (check_mntent): In AIX 4.3, MOUNTED isn't defined.
X-Git-Tag: E2FSPROGS-1.28-WIP-0817~47
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=5818d6789aaa795aeee1fdb0f7d812a1cabe3d1d;p=tools%2Fe2fsprogs.git

ismounted.c (check_mntent): In AIX 4.3, MOUNTED isn't defined.
	Add appropriate fallbacks in this case.
---

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index afe6f95..8e14c92 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-27  Theodore Ts'o  <tytso@mit.edu>
+
+	* ismounted.c (check_mntent): In AIX 4.3, MOUNTED isn't defined.
+		Add appropriate fallbacks in this case.
+
 2002-06-26  Theodore Ts'o  <tytso@mit.edu>
 
 	* dirhash.c (ext2fs_dirhash): Change function signature to support
diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
index 96b02d9..3dcc6f9 100644
--- a/lib/ext2fs/ismounted.c
+++ b/lib/ext2fs/ismounted.c
@@ -165,8 +165,16 @@ static errcode_t check_mntent(const char *file, int *mount_flags,
 	if (retval == 0)
 		return 0;
 #endif /* __linux__ */
+#if defined(MOUNTED) || defined(_PATH_MOUNTED)
+#ifndef MOUNTED
+#define MOUNTED _PATH_MOUNTED
+#endif /* MOUNTED */
 	retval = check_mntent_file(MOUNTED, file, mount_flags, mtpt, mtlen);
 	return retval;
+#else 
+	*mount_flags = 0;
+	return 0;
+#endif /* defined(MOUNTED) || defined(_PATH_MOUNTED) */
 }
 
 #elif defined(HAVE_GETMNTINFO)