From: Karel Zak <kzak@redhat.com>
Date: Wed, 18 Apr 2012 08:06:35 +0000 (+0200)
Subject: libmount: add mnt_context_get_options()
X-Git-Tag: v2.22-rc1~530
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d451abbbfd495983f9af857fec359681d487858;p=thirdparty%2Futil-linux.git

libmount: add mnt_context_get_options()

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libmount/docs/libmount-sections.txt b/libmount/docs/libmount-sections.txt
index 7610be99dc..c29232374d 100644
--- a/libmount/docs/libmount-sections.txt
+++ b/libmount/docs/libmount-sections.txt
@@ -21,7 +21,6 @@ mnt_new_context
 mnt_reset_context
 mnt_context_append_options
 mnt_context_apply_fstab
-mnt_context_fstab_applied
 mnt_context_disable_canonicalize
 mnt_context_disable_helpers
 mnt_context_disable_mtab
@@ -33,6 +32,7 @@ mnt_context_enable_loopdel
 mnt_context_enable_rdonly_umount
 mnt_context_enable_sloppy
 mnt_context_enable_verbose
+mnt_context_fstab_applied
 mnt_context_get_cache
 mnt_context_get_fs
 mnt_context_get_fstab
@@ -41,6 +41,7 @@ mnt_context_get_helper_status
 mnt_context_get_lock
 mnt_context_get_mflags
 mnt_context_get_mtab
+mnt_context_get_options
 mnt_context_get_optsmode
 mnt_context_get_source
 mnt_context_get_status
diff --git a/libmount/src/context.c b/libmount/src/context.c
index fe5c3f4bba..0d0282de83 100644
--- a/libmount/src/context.c
+++ b/libmount/src/context.c
@@ -702,7 +702,7 @@ int mnt_context_set_fstype(struct libmnt_context *cxt, const char *fstype)
  * mnt_context_get_fstype:
  * @cxt: mount context
  *
- * Returns: returns pointer or NULL in case of error pr if not set.
+ * Returns: pointer or NULL in case of error pr if not set.
  */
 const char *mnt_context_get_fstype(struct libmnt_context *cxt)
 {
@@ -733,6 +733,24 @@ int mnt_context_append_options(struct libmnt_context *cxt, const char *optstr)
 	return mnt_fs_append_options(mnt_context_get_fs(cxt), optstr);
 }
 
+/**
+ * mnt_context_get_options:
+ * @cxt: mount context
+ *
+ * This function returns mount options set by mnt_context_set_options() or
+ * mnt_context_append_options().
+ *
+ * Note that *after* mnt_context_prepare_mount() may the mount options string
+ * also includes options set by mnt_context_set_mflags() or another options
+ * generated by this library.
+ *
+ * Returns: pointer or NULL
+ */
+const char *mnt_context_get_options(struct libmnt_context *cxt)
+{
+	return mnt_fs_get_options(mnt_context_get_fs(cxt));
+}
+
 /**
  * mnt_context_set_fstype_pattern:
  * @cxt: mount context
diff --git a/libmount/src/libmount.h.in b/libmount/src/libmount.h.in
index 245431f270..6b347f98f7 100644
--- a/libmount/src/libmount.h.in
+++ b/libmount/src/libmount.h.in
@@ -445,6 +445,8 @@ extern const char *mnt_context_get_fstype(struct libmnt_context *cxt);
 extern int mnt_context_set_options(struct libmnt_context *cxt, const char *optstr);
 extern int mnt_context_append_options(struct libmnt_context *cxt,
 				      const char *optstr);
+extern const char *mnt_context_get_options(struct libmnt_context *cxt);
+
 extern int mnt_context_set_fstype_pattern(struct libmnt_context *cxt,
 				      const char *pattern);
 extern int mnt_context_set_options_pattern(struct libmnt_context *cxt,
diff --git a/libmount/src/libmount.sym b/libmount/src/libmount.sym
index c48b162487..4db8b12c6d 100644
--- a/libmount/src/libmount.sym
+++ b/libmount/src/libmount.sym
@@ -231,6 +231,7 @@ global:
 	mnt_fs_streq_target;
 	mnt_fs_streq_srcpath;
 	mnt_context_fstab_applied;
+	mnt_context_get_options;
 	mnt_context_is_loopdel;
 	mnt_context_is_nocanonicalize;
 	mnt_context_is_nohelpers;