ahill/nilfs-utils
1
0
Fork 0
mirror of https://github.com/nilfs-dev/nilfs-utils.git synced 2026-01-26 13:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

{mount,umount}.nilfs2: decouple libmount-based helpers from sundries

Browse Source 
Replace the legacy error() and die() functions derived from 'sundries.c'
with the standard <err.h> functions warnx() and errx() in the
libmount-based mount and umount helpers.

This change removes the dependency on 'sundries.h' and 'xmalloc.h',
completing the decoupling from the legacy implementation. Consequently,
'mount_quiet' and explicit program name handling in error messages are
removed, as err.h functions handle the program name automatically.

Accordingly, update 'Makefile.am' to exclude 'sundries.c' and
'xmalloc.c' from the common source list, moving them to legacy sources.

In addition, explicitly include <limits.h> in 'mount_attrs.c' and
'mount_libmount.c' to define ULONG_MAX, which was previously indirectly
included via 'sundries.h'.

Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com>
This commit is contained in:
Ryusuke Konishi 2026-01-19 14:42:13 +09:00
parent e371c65c5d
commit 1a54af4e7d
4 changed files with 86 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sbin/mount/Makefile.am
View File

@ -1,10 +1,11 @@
## Makefile.am
COMMONSOURCES = sundries.c xmalloc.c
COMMONHEADERS = mount.nilfs2.h sundries.h xmalloc.h
COMMONSOURCES =
COMMONHEADERS = mount.nilfs2.h
LEGACYSOURCES = fstab.c mount_mntent.c mount_opts.c
LEGACYHEADERS = fstab.h mount_constants.h mount_mntent.h mount_opts.h
LEGACYSOURCES = fstab.c mount_mntent.c mount_opts.c sundries.c xmalloc.c
LEGACYHEADERS = fstab.h mount_constants.h mount_mntent.h mount_opts.h \
sundries.h xmalloc.h
AM_CFLAGS = -Wall $(MOUNT_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/include -DCORE_SBINDIR=\"$(core_sbindir)\"

13
sbin/mount/mount_attrs.c
View File

@ -35,6 +35,10 @@
#include <stdlib.h>
#endif /* HAVE_STDLIB_H */
#if HAVE_LIMITS_H
#include <limits.h> /* ULONG_MAX */
#endif /* HAVE_LIMITS_H */
#if HAVE_ERR_H
#include <err.h>
#endif /* HAVE_ERR_H */
@ -49,7 +53,6 @@
#include <errno.h>
#include <assert.h>
#include "sundries.h"
#include "mount.nilfs2.h"
#include "mount_attrs.h"
#include "cleaner_exec.h" /* PIDOPT_NAME */
@ -140,14 +143,6 @@ int nilfs_mount_attrs_parse(struct nilfs_mount_attrs *mattrs,
return 0;
out_inval:
/*
* TODO: Implement proper verbosity control.
* Currently, warnx() is used unconditionally because the legacy
* 'mount_quiet' logic is inactive in the libmount version.
* Future cleanups should utilize the libmount context
* (e.g., mnt_context_get_mflags()) and remove dependencies on
* legacy sundries.c, etc.
*/
warnx(_("invalid options (%s)."), optstr);
res = -EINVAL;
failed:

100
sbin/mount/mount_libmount.c
View File

@ -43,6 +43,14 @@
#include <fcntl.h>
#endif /* HAVE_FCNTL_H */
#if HAVE_LIMITS_H
#include <limits.h> /* ULONG_MAX */
#endif /* HAVE_LIMITS_H */
#if HAVE_ERR_H
#include <err.h>
#endif /* HAVE_ERR_H */
#if HAVE_STRINGS_H
#include <strings.h>
#endif /* HAVE_STRINGS_H */
@ -74,8 +82,6 @@
#include <assert.h>
#include "libmount_compat.h"
#include "sundries.h"
#include "xmalloc.h"
#include "mount.nilfs2.h"
#include "mount_attrs.h"
#include "cleaner_exec.h"
@ -86,7 +92,6 @@
#endif /* _GNU_SOURCE */
/* mount options */
int mount_quiet; /* for sundries.c */
static int verbose;
static int devro;
@ -131,7 +136,7 @@ static int nilfs_libmount_table_errcb(struct libmnt_table *tb,
const char *filename, int line)
{
if (filename)
error(_("%s: parse error: ignore entry at line %d."),
warnx(_("%s: parse error: ignore entry at line %d."),
filename, line);
return 0;
}
@ -168,7 +173,7 @@ static void nilfs_mount_parse_options(int argc, char *argv[],
fs = mnt_context_get_fs(cxt);
if (!fs)
die(MNT_EX_SYSERR, _("failed to get fs"));
errx(MNT_EX_SYSERR, _("failed to get fs"));
while ((c = getopt(argc, argv, "fvnt:o:rwV")) != EOF) {
switch (c) {
@ -191,23 +196,23 @@ static void nilfs_mount_parse_options(int argc, char *argv[],
if (nilfs_mount_attrs_parse(&mi->new_attrs, optarg,
NULL, &rest, 0))
die(MNT_EX_SYSERR,
_("failed to parse options"));
errx(MNT_EX_SYSERR,
_("failed to parse options"));
if (rest && mnt_context_append_options(cxt, rest))
die(MNT_EX_SYSERR,
_("failed to append options"));
errx(MNT_EX_SYSERR,
_("failed to append options"));
free(rest);
break;
}
case 'r':
if (mnt_context_append_options(cxt, "ro"))
die(MNT_EX_SYSERR,
_("failed to append options"));
errx(MNT_EX_SYSERR,
_("failed to append options"));
break;
case 'w':
if (mnt_context_append_options(cxt, "rw"))
die(MNT_EX_SYSERR,
_("failed to append options"));
errx(MNT_EX_SYSERR,
_("failed to append options"));
break;
case 'V':
show_version_only = 1;
@ -253,7 +258,7 @@ static struct libmnt_fs *nilfs_find_mount(struct libmnt_context *cxt,
struct libmnt_fs *fs = NULL;
if (!iter)
die(MNT_EX_SYSERR, _("libmount iterator allocation failed"));
errx(MNT_EX_SYSERR, _("libmount iterator allocation failed"));
while (mnt_table_next_fs(mtab, iter, &fs) == 0) {
if (mnt_fs_match_fstype(fs, type) &&
@ -291,8 +296,7 @@ static int nilfs_prepare_mount(struct nilfs_mount_info *mi)
res = mnt_context_prepare_mount(cxt);
if (res < 0) {
error(_("%s: preparing failed: %s"), progname,
strerror(-res));
warnx(_("preparation failed: %s"), strerror(-res));
goto failed;
}
/*
@ -302,8 +306,7 @@ static int nilfs_prepare_mount(struct nilfs_mount_info *mi)
res = mnt_context_get_mflags(cxt, &mi->mflags);
if (res < 0) {
error(_("%s: get mount flags failed: %s"), progname,
strerror(-res));
warnx(_("get mount flags failed: %s"), strerror(-res));
goto failed;
}
@ -311,17 +314,15 @@ static int nilfs_prepare_mount(struct nilfs_mount_info *mi)
res = device_is_readonly(mnt_context_get_source(cxt),
&devro);
if (res < 0) {
error(_("%s: device %s not accessible: %s"),
progname, mnt_context_get_source(cxt),
strerror(-res));
warnx(_("device %s not accessible: %s"),
mnt_context_get_source(cxt), strerror(-res));
goto failed;
}
}
res = mnt_context_get_mtab(cxt, &mtab);
if (res < 0) {
error(_("%s: libmount mount check failed: %s"),
progname, strerror(-res));
warnx(_("libmount mount check failed: %s"), strerror(-res));
goto failed;
}
@ -336,9 +337,9 @@ static int nilfs_prepare_mount(struct nilfs_mount_info *mi)
switch (mi->mflags & (MS_RDONLY | MS_REMOUNT)) {
case 0: /* overlapping rw-mount */
error(_("%s: the device already has a rw-mount on %s.\n"
warnx(_("the device already has a rw-mount on %s.\n"
"\t\tmultiple rw-mount is not allowed."),
progname, mnt_fs_get_target(fs));
mnt_fs_get_target(fs));
res = -EBUSY;
goto failed;
case MS_RDONLY: /* ro-mount (a rw-mount exists) */
@ -353,16 +354,16 @@ static int nilfs_prepare_mount(struct nilfs_mount_info *mi)
res = nilfs_mount_attrs_parse(&mi->old_attrs, attrs,
NULL, NULL, 1);
if (res < 0) {
error(_("%s: libmount mount check failed: %s"),
progname, strerror(-res));
warnx(_("libmount mount check failed: %s"),
strerror(-res));
goto failed;
}
}
if (!mnt_fs_match_target(fs, mnt_context_get_target(cxt),
mnt_table_get_cache(mtab))) {
error(_("%s: different mount point (%s). remount failed."),
progname, mnt_context_get_target(cxt));
warnx(_("different mount point (%s). remount failed."),
mnt_context_get_target(cxt));
res = -EINVAL;
goto failed;
}
@ -371,8 +372,8 @@ static int nilfs_prepare_mount(struct nilfs_mount_info *mi)
res = nilfs_shutdown_cleanerd(
mnt_fs_get_source(fs), mi->old_attrs.gcpid);
if (res < 0) {
error(_("%s: remount failed due to %s shutdown failure"),
progname, NILFS_CLEANERD_NAME);
warnx(_("remount failed due to %s shutdown failure"),
NILFS_CLEANERD_NAME);
goto failed;
}
}
@ -403,11 +404,10 @@ static int nilfs_do_mount_one(struct nilfs_mount_info *mi)
switch (ec) {
case ENODEV:
error(_("%s: cannot find or load %s filesystem"), progname,
fstype);
warnx(_("cannot find or load %s filesystem"), fstype);
break;
default:
error(_("%s: Error while mounting %s on %s: %s"), progname,
warnx(_("Error while mounting %s on %s: %s"),
mnt_context_get_source(cxt),
mnt_context_get_target(cxt), strerror(ec));
break;
@ -431,8 +431,7 @@ static int nilfs_do_mount_one(struct nilfs_mount_info *mi)
nilfs_mount_attrs_update(&mi->old_attrs, &mattrs, cxt);
mnt_context_finalize_mount(cxt);
} else {
error(_("%s: failed to restart %s"),
progname, NILFS_CLEANERD_NAME);
warnx(_("failed to restart %s"), NILFS_CLEANERD_NAME);
}
} else {
printf(_("%s not restarted\n"), NILFS_CLEANERD_NAME);
@ -458,8 +457,7 @@ static int nilfs_mnt_context_complete_root(struct libmnt_context *cxt)
res = mnt_context_get_mtab(cxt, &mtab);
if (res < 0) {
error(_("%s: failed to get mtab: %s"), progname,
strerror(-res));
warnx(_("failed to get mtab: %s"), strerror(-res));
goto failed;
}
@ -468,8 +466,8 @@ static int nilfs_mnt_context_complete_root(struct libmnt_context *cxt)
res = mnt_fs_set_root(mnt_context_get_fs(cxt),
mnt_fs_get_root(fs));
if (res < 0) {
error(_("%s: failed to copy root of the mount: %s"),
progname, strerror(-res));
warnx(_("failed to copy root of the mount: %s"),
strerror(-res));
goto failed;
}
}
@ -508,7 +506,7 @@ static int nilfs_update_mount_state(struct nilfs_mount_info *mi)
mnt_context_get_target(cxt),
mi->new_attrs.pp,
&mi->new_attrs.gcpid) < 0)
error(_("%s aborted"), NILFS_CLEANERD_NAME);
warnx(_("%s aborted"), NILFS_CLEANERD_NAME);
else if (mnt_context_is_verbose(cxt))
printf(_("%s: started %s\n"), progname,
NILFS_CLEANERD_NAME);
@ -558,14 +556,14 @@ int main(int argc, char *argv[])
mnt_init_debug(0);
mi.cxt = mnt_new_context();
if (!mi.cxt)
die(MNT_EX_SYSERR, _("libmount context allocation failed"));
errx(MNT_EX_SYSERR, _("libmount context allocation failed"));
#if 0
mnt_context_set_tables_errcb(mi.cxt, nilfs_libmount_table_errcb);
#endif
if (mnt_context_set_fstype(mi.cxt, fstype))
die(MNT_EX_SYSERR,
_("libmount FS description allocation failed"));
errx(MNT_EX_SYSERR,
_("libmount FS description allocation failed"));
mnt_context_disable_helpers(mi.cxt, 1);
nilfs_mount_attrs_init(&mi.old_attrs);
@ -575,26 +573,26 @@ int main(int argc, char *argv[])
umask(022);
if (optind >= argc || !argv[optind])
die(MNT_EX_USAGE, _("No device specified"));
errx(MNT_EX_USAGE, _("No device specified"));
device = argv[optind++];
if (optind >= argc || !argv[optind])
die(MNT_EX_USAGE, _("No mountpoint specified"));
errx(MNT_EX_USAGE, _("No mountpoint specified"));
mntdir = argv[optind++];
if (mnt_context_set_source(mi.cxt, device) ||
mnt_context_set_target(mi.cxt, mntdir))
die(MNT_EX_SYSERR, _("Mount entry allocation failed"));
errx(MNT_EX_SYSERR, _("Mount entry allocation failed"));
if (mount_fstype && strncmp(mount_fstype, fstype, strlen(fstype)))
die(MNT_EX_USAGE, _("Unknown filesystem (%s)"), mount_fstype);
errx(MNT_EX_USAGE, _("Unknown filesystem (%s)"),
mount_fstype);
if (getuid() != geteuid())
die(MNT_EX_USAGE,
_("%s: mount by non-root user is not supported yet"),
progname);
errx(MNT_EX_USAGE,
_("mount by non-root user is not supported yet"));
res = nilfs_mount_one(&mi);

59
sbin/mount/umount_libmount.c
View File

@ -43,6 +43,10 @@
#include <fcntl.h>
#endif /* HAVE_FCNTL_H */
#if HAVE_ERR_H
#include <err.h>
#endif /* HAVE_ERR_H */
#if HAVE_STRINGS_H
#include <strings.h>
#endif /* HAVE_STRINGS_H */
@ -66,8 +70,6 @@
#include <assert.h>
#include "libmount_compat.h"
#include "sundries.h"
#include "xmalloc.h"
#include "mount.nilfs2.h"
#include "mount_attrs.h"
#include "cleaner_exec.h"
@ -78,7 +80,6 @@
#endif /* _GNU_SOURCE */
/* options */
int mount_quiet; /* for sundries.c */
static int verbose;
static int force;
static int suid; /* reserved for non-root user mount/umount
@ -115,7 +116,7 @@ static int nilfs_libmount_table_errcb(struct libmnt_table *tb,
const char *filename, int line)
{
if (filename)
error(_("%s: parse error: ignore entry at line %d."),
warnx(_("%s: parse error: ignore entry at line %d."),
filename, line);
return 0;
}
@ -135,7 +136,7 @@ static void nilfs_umount_parse_options(int argc, char *argv[],
fs = mnt_context_get_fs(cxt);
if (!fs)
die(MNT_EX_SYSERR, _("failed to get fs"));
errx(MNT_EX_SYSERR, _("failed to get fs"));
while ((c = getopt(argc, argv, "flnvrV")) != EOF) {
switch (c) {
@ -173,29 +174,28 @@ static void complain(int err, const char *node)
{
switch (err) {
case ENXIO:
error(_("%s: %s: invalid block device"), progname, node);
warnx(_("%s: invalid block device"), node);
break;
case EINVAL:
error(_("%s: %s: not mounted"), progname, node);
warnx(_("%s: not mounted"), node);
break;
case EIO:
error(_("%s: %s: I/O error while unmounting"), progname, node);
warnx(_("%s: I/O error while unmounting"), node);
break;
case EBUSY:
error(_("%s: %s: target is busy"), progname, node);
warnx(_("%s: target is busy"), node);
break;
case ENOENT:
error(_("%s: %s: not found"), progname, node);
warnx(_("%s: not found"), node);
break;
case EPERM:
error(_("%s: %s: must be superuser to umount"), progname, node);
warnx(_("%s: must be superuser to umount"), node);
break;
case EACCES:
error(_("%s: %s: block devices not permitted on fs"), progname,
node);
warnx(_("%s: block devices not permitted on fs"), node);
break;
default:
error(_("%s: %s: %s"), progname, node, strerror(err));
warnx(_("%s: %s"), node, strerror(err));
break;
}
}
@ -208,8 +208,7 @@ static int nilfs_prepare_umount(struct nilfs_umount_info *umi)
res = mnt_context_prepare_umount(cxt);
if (res < 0) {
error(_("%s: preparing failed: %s"), progname,
strerror(-res));
warnx(_("preparation failed: %s"), strerror(-res));
goto failed;
}
/*
@ -222,7 +221,7 @@ static int nilfs_prepare_umount(struct nilfs_umount_info *umi)
if (attrs) {
if (nilfs_mount_attrs_parse(&umi->old_attrs, attrs,
NULL, NULL, 1))
die(MNT_EX_SYSERR, _("failed to parse attributes"));
errx(MNT_EX_SYSERR, _("failed to parse attributes"));
}
res = 0;
failed:
@ -263,8 +262,7 @@ static int nilfs_do_umount_one(struct nilfs_umount_info *umi)
nilfs_mount_attrs_update(&umi->old_attrs, &mattrs, cxt);
mnt_context_finalize_umount(cxt);
} else {
error(_("%s: failed to restart %s"),
progname, NILFS_CLEANERD_NAME);
warnx(_("failed to restart %s"), NILFS_CLEANERD_NAME);
}
}
return res;
@ -317,7 +315,7 @@ int main(int argc, char *argv[])
mnt_init_debug(0);
umi.cxt = mnt_new_context();
if (!umi.cxt)
die(MNT_EX_SYSERR, _("libmount context allocation failed"));
errx(MNT_EX_SYSERR, _("libmount context allocation failed"));
nilfs_umount_parse_options(argc, argv, &umi);
@ -325,25 +323,24 @@ int main(int argc, char *argv[])
mnt_context_set_tables_errcb(umi.cxt, nilfs_libmount_table_errcb);
#endif
if (mnt_context_set_fstype(umi.cxt, fstype))
die(MNT_EX_SYSERR,
_("libmount FS description allocation failed"));
errx(MNT_EX_SYSERR,
_("libmount FS description allocation failed"));
mnt_context_disable_helpers(umi.cxt, 1);
umask(022);
if (force)
error(_("Force option is ignored (only supported for NFS)"));
warnx(_("Force option is ignored (only supported for NFS)"));
if (getuid() != geteuid()) {
suid = 1;
#if 0 /* XXX: normal user mount support */
if (mnt_context_is_nomtab(mi.cxt) ||
mnt_context_is_rdonly_umount(mi.cxt))
die(MNT_EX_USAGE, _("only root can do that"));
errx(MNT_EX_USAGE, _("only root can do that"));
#else
die(MNT_EX_USAGE,
_("%s: umount by non-root user is not supported yet"),
progname);
errx(MNT_EX_USAGE,
_("umount by non-root user is not supported yet"));
#endif
}
@ -351,11 +348,11 @@ int main(int argc, char *argv[])
argv += optind;
if (argc < 1)
die(MNT_EX_USAGE, _("No mountpoint specified"));
errx(MNT_EX_USAGE, _("No mountpoint specified"));
for( ; argc; argc--, argv++) {
if (**argv == '\0') {
error(_("%s: cannot umount ''"), progname);
warnx(_("cannot umount ''"));
no_fail = 0;
continue;
}
@ -364,8 +361,8 @@ int main(int argc, char *argv[])
if (mnt_context_set_source(umi.cxt, NULL) ||
mnt_context_set_target(umi.cxt, *argv))
die(MNT_EX_SYSERR,
_("Mount entry allocation failed"));
errx(MNT_EX_SYSERR,
_("Mount entry allocation failed"));
if (nilfs_umount_one(&umi) == 0)
no_succ = 0;