fdisk: cleanup wipe warning

[thirdparty/util-linux.git] / lib / ismounted.c

diff --git a/lib/ismounted.c b/lib/ismounted.c
index f83be65e09b40aca71a3e444b3beb250e1cf016c..fe4c329a7c34017b572619eea660e66f50524a68 100644 (file)
--- a/lib/ismounted.c
+++ b/lib/ismounted.c
@@ -29,6 +29,7 @@
 #endif
 
 #include "pathnames.h"
+#include "strutils.h"
 #include "ismounted.h"
 #include "c.h"
 #ifdef __linux__
@@ -85,7 +86,7 @@ static int check_mntent_file(const char *mtab_file, const char *file,
                        /* maybe the file is loopdev backing file */
                        if (file_dev
                            && major(st_buf.st_rdev) == LOOPDEV_MAJOR
-                           && loopdev_is_used(mnt->mnt_fsname, file, 0, 0))
+                           && loopdev_is_used(mnt->mnt_fsname, file, 0, 0, 0))
                                break;
 #endif /* __linux__ */
 #endif /* __GNU__ */
@@ -109,7 +110,7 @@ static int check_mntent_file(const char *mtab_file, const char *file,
                    st_buf.st_dev == file_rdev) {
                        *mount_flags = MF_MOUNTED;
                        if (mtpt)
-                               strncpy(mtpt, "/", mtlen);
+                               xstrncpy(mtpt, "/", mtlen);
                        goto is_root;
                }
 #endif /* __GNU__ */
@@ -150,7 +151,7 @@ static int check_mntent_file(const char *mtab_file, const char *file,
 #endif
 
        if (mtpt)
-               strncpy(mtpt, mnt->mnt_dir, mtlen);
+               xstrncpy(mtpt, mnt->mnt_dir, mtlen);
        /*
         * Check to see if we're referring to the root filesystem.
         * If so, do a manual check to see if we can open /etc/mtab
@@ -242,7 +243,7 @@ static int check_getmntinfo(const char *file, int *mount_flags,
                 ++mp;
        }
        if (mtpt)
-               strncpy(mtpt, mp->f_mntonname, mtlen);
+               xstrncpy(mtpt, mp->f_mntonname, mtlen);
        return 0;
 }
 #endif /* HAVE_GETMNTINFO */
@@ -321,7 +322,7 @@ int check_mount_point(const char *device, int *mount_flags,
        if (is_swap_device(device)) {
                *mount_flags = MF_MOUNTED | MF_SWAP;
                if (mtpt && mtlen)
-                       strncpy(mtpt, "[SWAP]", mtlen);
+                       xstrncpy(mtpt, "[SWAP]", mtlen);
        } else {
 #ifdef HAVE_MNTENT_H
                retval = check_mntent(device, mount_flags, mtpt, mtlen);
@@ -369,7 +370,7 @@ int is_mounted(const char *file)
        return mount_flags & MF_MOUNTED;
 }
 
-#ifdef TEST_PROGRAM
+#ifdef TEST_PROGRAM_ISMOUNTED
 int main(int argc, char **argv)
 {
        int flags = 0;