a few more GCC-isms removed
text data bss dec hex filename 824641 458 6956 832055 cb237 busybox_old 824631 458 6956 832045 cb22d busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
e66ccfaa2c
commit
d069e5398d
@ -27,7 +27,7 @@
|
|||||||
int logname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
int logname_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
||||||
int logname_main(int argc, char **argv UNUSED_PARAM)
|
int logname_main(int argc, char **argv UNUSED_PARAM)
|
||||||
{
|
{
|
||||||
char buf[128];
|
char buf[64];
|
||||||
|
|
||||||
if (argc > 1) {
|
if (argc > 1) {
|
||||||
bb_show_usage();
|
bb_show_usage();
|
||||||
|
@ -114,7 +114,7 @@ typedef struct nvblock_s {
|
|||||||
var *pos;
|
var *pos;
|
||||||
struct nvblock_s *prev;
|
struct nvblock_s *prev;
|
||||||
struct nvblock_s *next;
|
struct nvblock_s *next;
|
||||||
var nv[0];
|
var nv[];
|
||||||
} nvblock;
|
} nvblock;
|
||||||
|
|
||||||
typedef struct tsplitter_s {
|
typedef struct tsplitter_s {
|
||||||
|
@ -40,11 +40,24 @@ int su_main(int argc UNUSED_PARAM, char **argv)
|
|||||||
|
|
||||||
if (ENABLE_FEATURE_SU_SYSLOG) {
|
if (ENABLE_FEATURE_SU_SYSLOG) {
|
||||||
/* The utmp entry (via getlogin) is probably the best way to identify
|
/* The utmp entry (via getlogin) is probably the best way to identify
|
||||||
the user, especially if someone su's from a su-shell.
|
* the user, especially if someone su's from a su-shell.
|
||||||
But getlogin can fail -- usually due to lack of utmp entry.
|
* But getlogin can fail -- usually due to lack of utmp entry.
|
||||||
in this case resort to getpwuid. */
|
* in this case resort to getpwuid. */
|
||||||
old_user = xstrdup(IF_FEATURE_UTMP(getlogin() ? : ) (pw = getpwuid(cur_uid)) ? pw->pw_name : "");
|
const char *user;
|
||||||
tty = xmalloc_ttyname(2) ? : "none";
|
#if ENABLE_FEATURE_UTMP
|
||||||
|
char user_buf[64];
|
||||||
|
user = user_buf;
|
||||||
|
if (getlogin_r(user_buf, sizeof(user_buf)) != 0)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
pw = getpwuid(cur_uid);
|
||||||
|
user = pw ? pw->pw_name : "";
|
||||||
|
}
|
||||||
|
old_user = xstrdup(user);
|
||||||
|
tty = xmalloc_ttyname(2);
|
||||||
|
if (!tty) {
|
||||||
|
tty = "none";
|
||||||
|
}
|
||||||
openlog(applet_name, 0, LOG_AUTH);
|
openlog(applet_name, 0, LOG_AUTH);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user