disk-utils: s/MOUNTED/_PATH_MOUNTED/

no longer use deprecated alias.
helps compiling util-linux-ng against klibc.

add pathnames.h include, where _PATH_MOUNTED is defined.

Signed-off-by: maximilian attems <max@stro.at>

diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 8243b9cb5f3b075d584f37b378a0f761417d204a..5c577f61d5d75993b567b38e2abdd6a5952549cd 100644 (file)
--- a/disk-utils/fsck.minix.c
+++ b/disk-utils/fsck.minix.c
@@ -104,6 +104,7 @@
 
 #include "minix.h"
 #include "nls.h"
+#include "pathnames.h"
 
 #ifndef __linux__
 #define volatile
@@ -304,7 +305,7 @@ check_mount(void) {
        int cont;
        int fd;
 
-       if ((f = setmntent (MOUNTED, "r")) == NULL)
+       if ((f = setmntent (_PATH_MOUNTED, "r")) == NULL)
                return;
        while ((mnt = getmntent (f)) != NULL)
                if (strcmp (device_name, mnt->mnt_fsname) == 0)
@@ -318,7 +319,7 @@ check_mount(void) {
         * probably not correct; so we won't issue a warning based on
         * it.
         */
-       fd = open(MOUNTED, O_RDWR);
+       fd = open(_PATH_MOUNTED, O_RDWR);
        if (fd < 0 && errno == EROFS)
                return;
        else

diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c
index a5e099261e8b5e115a75b343ba4c91e10ccac75c..f97df27438bff7e55b79517bfd5ae525d4829c2b 100644 (file)
--- a/disk-utils/mkfs.minix.c
+++ b/disk-utils/mkfs.minix.c
@@ -75,6 +75,7 @@
 #include "blkdev.h"
 #include "minix.h"
 #include "nls.h"
+#include "pathnames.h"
 
 #ifndef __GNUC__
 #error "needs gcc for the bitop-__asm__'s"
@@ -172,7 +173,7 @@ check_mount(void) {
        FILE * f;
        struct mntent * mnt;
 
-       if ((f = setmntent (MOUNTED, "r")) == NULL)
+       if ((f = setmntent (_PATH_MOUNTED, "r")) == NULL)
                return;
        while ((mnt = getmntent (f)) != NULL)
                if (strcmp (device_name, mnt->mnt_fsname) == 0)

diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c
index 0bac74aba8aa6331be18a5c7a5c9f9b5d02c716f..f7dbdf39903896968b72ec1118776dcc82620e23 100644 (file)
--- a/disk-utils/mkswap.c
+++ b/disk-utils/mkswap.c
@@ -51,6 +51,7 @@
 #include "xstrncpy.h"
 #include "nls.h"
 #include "blkdev.h"
+#include "pathnames.h"
 
 #ifdef HAVE_LIBUUID
 #include <uuid/uuid.h>
@@ -425,7 +426,7 @@ check_mount(void) {
        FILE * f;
        struct mntent * mnt;
 
-       if ((f = setmntent (MOUNTED, "r")) == NULL)
+       if ((f = setmntent (_PATH_MOUNTED, "r")) == NULL)
                return 0;
        while ((mnt = getmntent (f)) != NULL)
                if (strcmp (device_name, mnt->mnt_fsname) == 0)