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@xxxxxxx>
diff --git a/disk-utils/fsck.minix.c b/disk-utils/fsck.minix.c
index 8243b9c..5c577f6 100644
--- 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 a5e0992..f97df27 100644
--- 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 0bac74a..f7dbdf3 100644
--- 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)
--
maks
--
To unsubscribe from this list: send the line "unsubscribe util-linux-ng" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
