2000-02-09 01:28:47 +05:30
|
|
|
/* vi: set sw=4 ts=4: */
|
2001-10-24 10:30:29 +05:30
|
|
|
/*
|
|
|
|
* Utility routines.
|
|
|
|
*
|
2004-03-15 13:59:22 +05:30
|
|
|
* Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
|
2001-10-24 10:30:29 +05:30
|
|
|
*
|
2010-08-16 23:44:46 +05:30
|
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
2001-10-24 10:30:29 +05:30
|
|
|
*/
|
1999-11-06 10:26:00 +05:30
|
|
|
#include <mntent.h>
|
2001-04-01 21:31:11 +05:30
|
|
|
#include "libbb.h"
|
1999-11-06 10:26:00 +05:30
|
|
|
|
2006-11-27 22:59:09 +05:30
|
|
|
#if ENABLE_FEATURE_MTAB_SUPPORT
|
2008-06-27 08:22:20 +05:30
|
|
|
void FAST_FUNC erase_mtab(const char *name)
|
1999-11-06 10:26:00 +05:30
|
|
|
{
|
2008-07-10 01:14:08 +05:30
|
|
|
struct mntent *entries;
|
|
|
|
int i, count;
|
2006-11-27 22:59:09 +05:30
|
|
|
FILE *mountTable;
|
2000-02-09 01:28:47 +05:30
|
|
|
struct mntent *m;
|
1999-11-06 10:26:00 +05:30
|
|
|
|
2006-11-27 22:59:09 +05:30
|
|
|
mountTable = setmntent(bb_path_mtab_file, "r");
|
|
|
|
/* Bummer. Fall back on trying the /proc filesystem */
|
|
|
|
if (!mountTable) mountTable = setmntent("/proc/mounts", "r");
|
|
|
|
if (!mountTable) {
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg(bb_path_mtab_file);
|
1999-11-06 10:26:00 +05:30
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2008-07-10 01:14:08 +05:30
|
|
|
entries = NULL;
|
|
|
|
count = 0;
|
2006-11-27 22:59:09 +05:30
|
|
|
while ((m = getmntent(mountTable)) != 0) {
|
2008-07-10 01:14:08 +05:30
|
|
|
entries = xrealloc_vector(entries, 3, count);
|
2008-07-08 10:44:36 +05:30
|
|
|
entries[count].mnt_fsname = xstrdup(m->mnt_fsname);
|
|
|
|
entries[count].mnt_dir = xstrdup(m->mnt_dir);
|
|
|
|
entries[count].mnt_type = xstrdup(m->mnt_type);
|
|
|
|
entries[count].mnt_opts = xstrdup(m->mnt_opts);
|
|
|
|
entries[count].mnt_freq = m->mnt_freq;
|
|
|
|
entries[count].mnt_passno = m->mnt_passno;
|
2008-07-10 01:14:08 +05:30
|
|
|
count++;
|
1999-11-06 10:26:00 +05:30
|
|
|
}
|
|
|
|
endmntent(mountTable);
|
|
|
|
|
2008-07-10 01:14:08 +05:30
|
|
|
//TODO: make update atomic
|
2006-11-27 22:59:09 +05:30
|
|
|
mountTable = setmntent(bb_path_mtab_file, "w");
|
|
|
|
if (mountTable) {
|
2000-02-09 01:28:47 +05:30
|
|
|
for (i = 0; i < count; i++) {
|
2006-11-27 22:59:09 +05:30
|
|
|
if (strcmp(entries[i].mnt_fsname, name) != 0
|
|
|
|
&& strcmp(entries[i].mnt_dir, name) != 0)
|
1999-11-06 10:26:00 +05:30
|
|
|
addmntent(mountTable, &entries[i]);
|
|
|
|
}
|
|
|
|
endmntent(mountTable);
|
2000-02-09 01:28:47 +05:30
|
|
|
} else if (errno != EROFS)
|
libbb: reduce the overhead of single parameter bb_error_msg() calls
Back in 2007, commit 0c97c9d43707 ("'simple' error message functions by
Loic Grenie") introduced bb_simple_perror_msg() to allow for a lower
overhead call to bb_perror_msg() when only a string was being printed
with no parameters. This saves space for some CPU architectures because
it avoids the overhead of a call to a variadic function. However there
has never been a simple version of bb_error_msg(), and since 2007 many
new calls to bb_perror_msg() have been added that only take a single
parameter and so could have been using bb_simple_perror_message().
This changeset introduces 'simple' versions of bb_info_msg(),
bb_error_msg(), bb_error_msg_and_die(), bb_herror_msg() and
bb_herror_msg_and_die(), and replaces all calls that only take a
single parameter, or use something like ("%s", arg), with calls to the
corresponding 'simple' version.
Since it is likely that single parameter calls to the variadic functions
may be accidentally reintroduced in the future a new debugging config
option WARN_SIMPLE_MSG has been introduced. This uses some macro magic
which will cause any such calls to generate a warning, but this is
turned off by default to avoid use of the unpleasant macros in normal
circumstances.
This is a large changeset due to the number of calls that have been
replaced. The only files that contain changes other than simple
substitution of function calls are libbb.h, libbb/herror_msg.c,
libbb/verror_msg.c and libbb/xfuncs_printf.c. In miscutils/devfsd.c,
networking/udhcp/common.h and util-linux/mdev.c additonal macros have
been added for logging so that single parameter and multiple parameter
logging variants exist.
The amount of space saved varies considerably by architecture, and was
found to be as follows (for 'defconfig' using GCC 7.4):
Arm: -92 bytes
MIPS: -52 bytes
PPC: -1836 bytes
x86_64: -938 bytes
Note that for the MIPS architecture only an exception had to be made
disabling the 'simple' calls for 'udhcp' (in networking/udhcp/common.h)
because it made these files larger on MIPS.
Signed-off-by: James Byrne <james.byrne@origamienergy.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2019-07-02 15:05:03 +05:30
|
|
|
bb_simple_perror_msg(bb_path_mtab_file);
|
1999-11-06 10:26:00 +05:30
|
|
|
}
|
Major rewrite of mount, umount, losetup. Untangled lots of code, shrunk
things down a bit, fixed a number of funky corner cases, added support for
several new features (things like mount --move, mount --bind, lazy unounts,
automatic detection of loop mounts, and so on). Probably broke several
other things, but it's fixable. (Bang on it, tell me what doesn't work for
you...)
Note: you no longer need to say "-o loop". It does that for you when
necessary.
Still need to add "user mount" support, which involves making mount suid. Not
too hard to do under the new infrastructure, just haven't done it yet...
The previous code had the following notes, that belong in the version
control comments:
- * 3/21/1999 Charles P. Wright <cpwright@cpwright.com>
- * searches through fstab when -a is passed
- * will try mounting stuff with all fses when passed -t auto
- *
- * 1999-04-17 Dave Cinege...Rewrote -t auto. Fixed ro mtab.
- *
- * 1999-10-07 Erik Andersen <andersen@codepoet.org>.
- * Rewrite of a lot of code. Removed mtab usage (I plan on
- * putting it back as a compile-time option some time),
- * major adjustments to option parsing, and some serious
- * dieting all around.
- *
- * 1999-11-06 mtab support is back - andersee
- *
- * 2000-01-12 Ben Collins <bcollins@debian.org>, Borrowed utils-linux's
- * mount to add loop support.
- *
- * 2000-04-30 Dave Cinege <dcinege@psychosis.com>
- * Rewrote fstab while loop and lower mount section. Can now do
- * single mounts from fstab. Can override fstab options for single
- * mount. Common mount_one call for single mounts and 'all'. Fixed
- * mtab updating and stale entries. Removed 'remount' default.
- *
2005-08-11 02:05:54 +05:30
|
|
|
#endif
|