libmount: use mnt_fs for mtab API

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

diff --git a/shlibs/mount/src/fs.c b/shlibs/mount/src/fs.c
index b0de9eaef0f98339c7070e4d1c77b91603885962..4931d078538f4848e32c613f994bf81d3b4d587e 100644 (file)
--- a/shlibs/mount/src/fs.c
+++ b/shlibs/mount/src/fs.c
@@ -62,7 +62,7 @@ void mnt_free_fs(mnt_fs *fs)
        free(fs);
 }
 
-static inline int cpy_str_item(void *new, void *old, size_t offset)
+static inline int cpy_str_item(void *new, const void *old, size_t offset)
 {
        char **o = (char **) (old + offset);
        char **n = (char **) (new + offset);
@@ -85,7 +85,7 @@ static inline int cpy_str_item(void *new, void *old, size_t offset)
  *
  * Returns: copy of @fs
  */
-mnt_fs *mnt_copy_fs(mnt_fs *fs)
+mnt_fs *mnt_copy_fs(const mnt_fs *fs)
 {
        mnt_fs *n = mnt_new_fs();
 

diff --git a/shlibs/mount/src/mtab.c b/shlibs/mount/src/mtab.c
index eeef8a0c2affaf1b0a71c70bab8bb42c42e73f7f..12a33c51528a0d360c8d237944183049b6bd8f71 100644 (file)
--- a/shlibs/mount/src/mtab.c
+++ b/shlibs/mount/src/mtab.c
@@ -72,7 +72,7 @@ struct _mnt_mtab {
  *
  * Returns: newly allocated mtab description
  */
-mnt_mtab *mnt_new_mtab(int action)
+mnt_mtab *mnt_new_mtab(int action, unsigned long mountflags, const mnt_fs *fs)
 {
        mnt_mtab *mt;
 
@@ -83,19 +83,13 @@ mnt_mtab *mnt_new_mtab(int action)
        DBG(DEBUG_MTAB, fprintf(stderr,
                "libmount: mtab %p: allocate\n", mt));
 
-       mt->action = action;
-       mt->fs = mnt_new_fs();
-       if (!mt->fs)
-               goto err;
+       if (action)
+               mnt_mtab_set_action(mt, action);
+       if (mountflags)
+               mnt_mtab_set_mountflags(mt, mountflags);
+       if (fs)
+               mnt_mtab_set_fs(mt, fs);
        return mt;
-err:
-       mnt_free_fs(mt->fs);
-       free(mt);
-
-       DBG(DEBUG_MTAB, fprintf(stderr,
-               "libmount: mtab: failed to allocate handler\n"));
-
-       return NULL;
 }
 
 /**
@@ -113,7 +107,9 @@ void mnt_free_mtab(mnt_mtab *mt)
                "libmount: mtab %p: deallacate\n", mt));
 
        mnt_free_lock(mt->lc);
+       mnt_free_fs(mt->fs);
        free(mt->filename);
+       free(mt->old_target);
        free(mt);
 }
 
@@ -127,8 +123,8 @@ void mnt_free_mtab(mnt_mtab *mt)
 int mnt_mtab_set_filename(mnt_mtab *mt, const char *filename)
 {
        char *p = NULL;
-       assert(mt);
 
+       assert(mt);
        if (!mt)
                return -1;
        if (filename) {
@@ -179,20 +175,30 @@ int mnt_mtab_set_format(mnt_mtab *mt, int format)
 }
 
 /**
- * mnt_mtab_set_optstr:
+ * mnt_mtab_set_fs:
  * @mt: mtab
- * @optstr: mount options that will be used for mount(2)
+ * @fs: filesystem to write to mtab
  *
- * Note that mnt_mtab_prepare_update() will remove options that does not belong
- * to mtab.
+ * This function could be used instead of mnt_mtab_set_{fstype,source,target,optstr}.
  *
- * Returns: 0 on success, -1 in case of error.
+ * Returns; 0 on success, -1 in case of error.
  */
-int mnt_mtab_set_optstr(mnt_mtab *mt, const char *optstr)
+int mnt_mtab_set_fs(mnt_mtab *mt, const mnt_fs *fs)
 {
+       mnt_fs *x = NULL;
+
+       assert(mt);
        if (!mt)
                return -1;
-       return mnt_fs_set_optstr(mt->fs, optstr);
+       if (fs) {
+               x = mnt_copy_fs(fs);
+               if (!x)
+                       return -1;
+       }
+
+       mnt_free_fs(mt->fs);
+       mt->fs = x;
+       return 0;
 }
 
 /**
@@ -252,30 +258,6 @@ int mnt_mtab_disable_lock(mnt_mtab *mt, int disable)
        return 0;
 }
 
-/**
- * mnt_mtab_set_source:
- * @mt: mtab
- * @source: device or directory name
- *
- * Returns: 0 on success, -1 in case of error.
- */
-int mnt_mtab_set_source(mnt_mtab *mt, const char *source)
-{
-       return mt ? mnt_fs_set_source(mt->fs, source) : -1;
-}
-
-/**
- * mnt_mtab_set_target:
- * @mt: mtab
- * @target: mountpoint
- *
- * Returns: 0 on success, -1 in case of error.
- */
-int mnt_mtab_set_target(mnt_mtab *mt, const char *target)
-{
-       return mt ? mnt_fs_set_target(mt->fs, target) : -1;
-}
-
 /**
  * mnt_mtab_set_old_target:
  * @mt: mtab
@@ -287,29 +269,20 @@ int mnt_mtab_set_target(mnt_mtab *mt, const char *target)
  */
 int mnt_mtab_set_old_target(mnt_mtab *mt, const char *target)
 {
-       if (!mt)
-               return -1;
-       mt->old_target = strdup(target);
-       if (!mt->old_target)
-               return -1;
-       return 0;
-}
+       char *p = NULL;
 
-/**
- * mnt_mtab_set_fstype:
- * @mt: mtab
- * @fstype: filesystem type (e.g. "ext3")
- *
- * Returns: 0 on success, -1 in case of error.
- */
-int mnt_mtab_set_fstype(mnt_mtab *mt, const char *fstype)
-{
        if (!mt)
                return -1;
-       return mnt_fs_set_fstype(mt->fs, fstype);
+       if (p) {
+               p = strdup(target);
+               if (!p)
+                       return -1;
+       }
+       free(mt->old_target);
+       mt->old_target = p;
+       return 0;
 }
 
-
 /*
  * The format is same as /proc/self/mountinfo, but it contains userspace
  * mount options and some unncessary fields are ignored.
@@ -567,8 +540,9 @@ int mnt_mtab_prepare_update(mnt_mtab *mt)
        const char *o = NULL;
 
        assert(mt);
+       assert(mt->fs);
 
-       if (!mt)
+       if (!mt || !mt->fs)
                return -1;
 
        DBG(DEBUG_MTAB, fprintf(stderr,
@@ -807,8 +781,9 @@ int mnt_update_mtab(mnt_mtab *mt)
        assert(mt);
        assert(mt->filename);
        assert(mt->format);
+       assert(mt->fs);
 
-       if (!mt)
+       if (!mt || !mt->fs)
                return -1;
 
        DBG(DEBUG_MTAB, fprintf(stderr,
@@ -872,80 +847,91 @@ static int update(mnt_mtab *mt)
 
 int test_add(struct mtest *ts, int argc, char *argv[])
 {
+       mnt_fs *fs = mnt_new_fs();
        mnt_mtab *mt;
        int rc = -1;
 
-       if (argc < 5)
+       if (argc < 5 || !fs)
                return -1;
-       mt = mnt_new_mtab(MNT_ACT_MOUNT);
+       mnt_fs_set_source(fs, argv[1]);
+       mnt_fs_set_target(fs, argv[2]);
+       mnt_fs_set_fstype(fs, argv[3]);
+       mnt_fs_set_optstr(fs, argv[4]);
+
+       mt = mnt_new_mtab(MNT_ACT_MOUNT, 0, fs);
        if (!mt)
                return -1;
-       mnt_mtab_set_source(mt, argv[1]);
-       mnt_mtab_set_target(mt, argv[2]);
-       mnt_mtab_set_fstype(mt, argv[3]);
-       mnt_mtab_set_optstr(mt, argv[4]);
 
        rc = update(mt);
 
        mnt_free_mtab(mt);
+       mnt_free_fs(fs);
        return rc;
 }
 
 int test_remove(struct mtest *ts, int argc, char *argv[])
 {
+       mnt_fs *fs = mnt_new_fs();
        mnt_mtab *mt;
        int rc = -1;
 
-       if (argc < 2)
+       if (argc < 2 || !fs)
                return -1;
-       mt = mnt_new_mtab(MNT_ACT_UMOUNT);
+       mnt_fs_set_target(fs, argv[1]);
+
+       mt = mnt_new_mtab(MNT_ACT_UMOUNT, 0, fs);
        if (!mt)
                return -1;
-       mnt_mtab_set_target(mt, argv[1]);
 
        rc = update(mt);
 
        mnt_free_mtab(mt);
+       mnt_free_fs(fs);
        return rc;
 }
 
 int test_move(struct mtest *ts, int argc, char *argv[])
 {
+       mnt_fs *fs = mnt_new_fs();
        mnt_mtab *mt;
        int rc = -1;
 
-       if (argc < 3)
+       if (argc < 3 || !fs)
                return -1;
-       mt = mnt_new_mtab(MNT_ACT_MOUNT);
+       mnt_fs_set_target(fs, argv[2]);
+
+       mt = mnt_new_mtab(MNT_ACT_MOUNT, MS_MOVE, fs);
        if (!mt)
                return -1;
-       mnt_mtab_set_mountflags(mt, MS_MOVE);
        mnt_mtab_set_old_target(mt, argv[1]);
-       mnt_mtab_set_target(mt, argv[2]);
 
        rc = update(mt);
 
        mnt_free_mtab(mt);
+       mnt_free_fs(fs);
        return rc;
 }
 
 int test_remount(struct mtest *ts, int argc, char *argv[])
 {
+       mnt_fs *fs = mnt_new_fs();
        mnt_mtab *mt;
        int rc = -1;
 
-       if (argc < 3)
+       if (argc < 3 || !fs)
                return -1;
-       mt = mnt_new_mtab(MNT_ACT_MOUNT);
+
+       mnt_fs_set_target(fs, argv[1]);
+       mnt_fs_set_optstr(fs, argv[2]);
+
+       mt = mnt_new_mtab(MNT_ACT_MOUNT, MS_REMOUNT, fs);
        if (!mt)
                return -1;
-       mnt_mtab_set_mountflags(mt, MS_REMOUNT);
-       mnt_mtab_set_target(mt, argv[1]);
-       mnt_mtab_set_optstr(mt, argv[2]);
 
        rc = update(mt);
 
        mnt_free_mtab(mt);
+       mnt_free_fs(fs);
        return rc;
 }