aboutsummaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2015-10-09 16:42:57 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2015-10-09 16:42:57 +0200
commit550bf5b4a418378cd8f9fbbf5252fe57acdacb5a (patch)
tree7ed13e04cf415be6830363953220d7cffd4580b8 /loginutils
parent4cd99e7c6c1af77721b890ed5ae26d747796c4bd (diff)
downloadbusybox-w32-550bf5b4a418378cd8f9fbbf5252fe57acdacb5a.tar.gz
busybox-w32-550bf5b4a418378cd8f9fbbf5252fe57acdacb5a.tar.bz2
busybox-w32-550bf5b4a418378cd8f9fbbf5252fe57acdacb5a.zip
remove global "jmp_buf die_jmp" from !FEATURE_PREFER_APPLETS builds
function old new delta xfunc_has_died - 21 +21 sleep_much - 12 +12 sleep10 - 9 +9 die_func - 4 +4 fflush_stdout_and_exit 35 36 +1 builtin_type 121 119 -2 die_sleep 4 - -4 xfunc_die 60 24 -36 hush_main 1128 1011 -117 die_jmp 156 - -156 ------------------------------------------------------------------------------ (add/remove: 4/2 grow/shrink: 1/3 up/down: 47/-315) Total: -268 bytes text data bss dec hex filename 939992 992 17652 958636 ea0ac busybox_old 939880 992 17496 958368 e9fa0 busybox_unstripped Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/getty.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/loginutils/getty.c b/loginutils/getty.c
index 174542841..762d5c773 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -520,6 +520,11 @@ static void alarm_handler(int sig UNUSED_PARAM)
520 _exit(EXIT_SUCCESS); 520 _exit(EXIT_SUCCESS);
521} 521}
522 522
523static void sleep10(void)
524{
525 sleep(10);
526}
527
523int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 528int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
524int getty_main(int argc UNUSED_PARAM, char **argv) 529int getty_main(int argc UNUSED_PARAM, char **argv)
525{ 530{
@@ -599,7 +604,7 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
599 close(n--); 604 close(n--);
600 605
601 /* Logging. We want special flavor of error_msg_and_die */ 606 /* Logging. We want special flavor of error_msg_and_die */
602 die_sleep = 10; 607 die_func = sleep10;
603 msg_eol = "\r\n"; 608 msg_eol = "\r\n";
604 /* most likely will internally use fd #3 in CLOEXEC mode: */ 609 /* most likely will internally use fd #3 in CLOEXEC mode: */
605 openlog(applet_name, LOG_PID, LOG_AUTH); 610 openlog(applet_name, LOG_PID, LOG_AUTH);