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>
61 lines
1.7 KiB
C
61 lines
1.7 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Mini logname implementation for busybox
|
|
*
|
|
* Copyright (C) 2000 Edward Betts <edward@debian.org>.
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
|
|
*/
|
|
/* Mar 16, 2003 Manuel Novoa III (mjn3@codepoet.org)
|
|
*
|
|
* SUSv3 specifies the string used is that returned from getlogin().
|
|
* The previous implementation used getpwuid() for geteuid(), which
|
|
* is _not_ the same. Erik apparently made this change almost 3 years
|
|
* ago to avoid failing when no utmp was available. However, the
|
|
* correct course of action wrt SUSv3 for a failing getlogin() is
|
|
* a diagnostic message and an error return.
|
|
*/
|
|
//config:config LOGNAME
|
|
//config: bool "logname (1.1 kb)"
|
|
//config: default y
|
|
//config: help
|
|
//config: logname is used to print the current user's login name.
|
|
|
|
//applet:IF_LOGNAME(APPLET_NOFORK(logname, logname, BB_DIR_USR_BIN, BB_SUID_DROP, logname))
|
|
|
|
//kbuild:lib-$(CONFIG_LOGNAME) += logname.o
|
|
|
|
/* BB_AUDIT SUSv3 compliant */
|
|
/* http://www.opengroup.org/onlinepubs/007904975/utilities/logname.html */
|
|
|
|
//usage:#define logname_trivial_usage
|
|
//usage: ""
|
|
//usage:#define logname_full_usage "\n\n"
|
|
//usage: "Print the name of the current user"
|
|
//usage:
|
|
//usage:#define logname_example_usage
|
|
//usage: "$ logname\n"
|
|
//usage: "root\n"
|
|
|
|
#include "libbb.h"
|
|
|
|
/* This is a NOFORK applet. Be very careful! */
|
|
|
|
int logname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
int logname_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
|
|
{
|
|
char buf[64];
|
|
|
|
if (argv[1]) {
|
|
bb_show_usage();
|
|
}
|
|
|
|
/* Using _r function - avoid pulling in static buffer from libc */
|
|
if (getlogin_r(buf, sizeof(buf)) == 0) {
|
|
puts(buf);
|
|
return fflush_all();
|
|
}
|
|
|
|
bb_simple_perror_msg_and_die("getlogin");
|
|
}
|