6937487be7
Back in 2007, commit 0c97c9d437 ("'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>
99 lines
2.5 KiB
C
99 lines
2.5 KiB
C
/* ubirename - port of the ubirename from the mtd-utils package
|
|
*
|
|
* A utility to rename one UBI volume.
|
|
*
|
|
* 2016-03-01 Sven Eisenberg <sven.eisenberg@novero.com>
|
|
*
|
|
* Licensed under GPLv2, see file LICENSE in this source tree.
|
|
*/
|
|
//config:config UBIRENAME
|
|
//config: bool "ubirename (2.4 kb)"
|
|
//config: default y
|
|
//config: select PLATFORM_LINUX
|
|
//config: help
|
|
//config: Utility to rename UBI volumes
|
|
|
|
//applet:IF_UBIRENAME(APPLET(ubirename, BB_DIR_USR_SBIN, BB_SUID_DROP))
|
|
/* not NOEXEC: if flash operation stalls, use less memory in "hung" process */
|
|
|
|
//kbuild:lib-$(CONFIG_UBIRENAME) += ubirename.o
|
|
|
|
//usage:#define ubirename_trivial_usage
|
|
//usage: "UBI_DEVICE OLD_VOLNAME NEW_VOLNAME [OLD2 NEW2]..."
|
|
//usage:#define ubirename_full_usage "\n\n"
|
|
//usage: "Rename UBI volumes on UBI_DEVICE"
|
|
|
|
#include "libbb.h"
|
|
#include <mtd/mtd-user.h>
|
|
|
|
#ifndef __packed
|
|
# define __packed __attribute__((packed))
|
|
#endif
|
|
|
|
// from ubi-media.h
|
|
#define UBI_MAX_VOLUME_NAME 127
|
|
#define UBI_MAX_VOLUMES 128
|
|
// end ubi-media.h
|
|
|
|
// from ubi-user.h
|
|
/* ioctl commands of UBI character devices */
|
|
#define UBI_IOC_MAGIC 'o'
|
|
|
|
/* Re-name volumes */
|
|
#define UBI_IOCRNVOL _IOW(UBI_IOC_MAGIC, 3, struct ubi_rnvol_req)
|
|
|
|
/* Maximum amount of UBI volumes that can be re-named at one go */
|
|
#define UBI_MAX_RNVOL 32
|
|
|
|
struct ubi_rnvol_req {
|
|
int32_t count;
|
|
int8_t padding1[12];
|
|
struct {
|
|
int32_t vol_id;
|
|
int16_t name_len;
|
|
int8_t padding2[2];
|
|
char name[UBI_MAX_VOLUME_NAME + 1];
|
|
} ents[UBI_MAX_RNVOL];
|
|
} __packed;
|
|
// end ubi-user.h
|
|
|
|
int ubirename_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int ubirename_main(int argc, char **argv)
|
|
{
|
|
struct ubi_rnvol_req *rnvol;
|
|
const char *ubi_devname;
|
|
unsigned ubi_devnum;
|
|
unsigned n;
|
|
|
|
/* argc can be 4, 6, 8, ... */
|
|
if ((argc & 1) || (argc >>= 1) < 2)
|
|
bb_show_usage();
|
|
|
|
rnvol = xzalloc(sizeof(*rnvol));
|
|
rnvol->count = --argc;
|
|
if (argc > ARRAY_SIZE(rnvol->ents))
|
|
bb_simple_error_msg_and_die("too many renames requested");
|
|
|
|
ubi_devname = argv[1];
|
|
ubi_devnum = ubi_devnum_from_devname(ubi_devname);
|
|
|
|
n = 0;
|
|
argv += 2;
|
|
while (argv[0]) {
|
|
rnvol->ents[n].vol_id = ubi_get_volid_by_name(ubi_devnum, argv[0]);
|
|
|
|
/* strnlen avoids overflow of 16-bit field (paranoia) */
|
|
rnvol->ents[n].name_len = strnlen(argv[1], sizeof(rnvol->ents[n].name));
|
|
if (rnvol->ents[n].name_len >= sizeof(rnvol->ents[n].name))
|
|
bb_error_msg_and_die("new name '%s' is too long", argv[1]);
|
|
|
|
strcpy(rnvol->ents[n].name, argv[1]);
|
|
n++;
|
|
argv += 2;
|
|
}
|
|
|
|
xioctl(xopen(ubi_devname, O_RDONLY), UBI_IOCRNVOL, rnvol);
|
|
|
|
return 0;
|
|
}
|