libbb: bb_do_delay(3) -> pause_after_failed_login(), and stop looping there

function                                             old     new   delta
pause_after_failed_login                               -       9      +9
vlock_main                                           358     353      -5
sulogin_main                                         252     247      -5
su_main                                              484     479      -5
passwd_main                                          936     931      -5
login_main                                           967     962      -5
bb_do_delay                                           68       -     -68
------------------------------------------------------------------------------
(add/remove: 1/1 grow/shrink: 0/5 up/down: 9/-93)             Total: -84 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

8 files changed, 26 insertions, 15 deletions

diff --git a/include/libbb.h b/include/libbb.h
index e56fff3e8..6b822016e 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1604,9 +1604,10 @@ char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC;
 #ifndef LOGIN_FAIL_DELAY
 #define LOGIN_FAIL_DELAY 3
 #endif
-extern void bb_do_delay(int seconds) FAST_FUNC;
-extern void change_identity(const struct passwd *pw) FAST_FUNC;
-extern void run_shell(const char *shell, int loginshell, const char **args) NORETURN FAST_FUNC;
+void pause_after_failed_login(void) FAST_FUNC;
+void bb_do_delay(int seconds) FAST_FUNC;
+void change_identity(const struct passwd *pw) FAST_FUNC;
+void run_shell(const char *shell, int loginshell, const char **args) NORETURN FAST_FUNC;
 
 /* Returns $SHELL, getpwuid(getuid())->pw_shell, or DEFAULT_SHELL.
  * Note that getpwuid result might need xstrdup'ing
diff --git a/libbb/bb_do_delay.c b/libbb/bb_do_delay.c
index 65541704b..29343305d 100644
--- a/libbb/bb_do_delay.c
+++ b/libbb/bb_do_delay.c
@@ -8,13 +8,23 @@
  */
 #include "libbb.h"
 
-void FAST_FUNC bb_do_delay(int seconds)
+/* void FAST_FUNC bb_do_delay(int seconds) { ... } - no users yet */
+
+#ifndef LOGIN_FAIL_DELAY
+#define LOGIN_FAIL_DELAY 3
+#endif
+void FAST_FUNC pause_after_failed_login(void)
 {
-	time_t start, now;
+#if 0 /* over-engineered madness */
+	time_t end, diff;
 
-	start = time(NULL);
+	end = time(NULL) + LOGIN_FAIL_DELAY;
+	diff = LOGIN_FAIL_DELAY;
 	do {
-		sleep(seconds);
-		now = time(NULL);
-	} while ((now - start) < seconds);
+		sleep(diff);
+		diff = end - time(NULL);
+	} while (diff > 0);
+#else
+	sleep(LOGIN_FAIL_DELAY);
+#endif
 }
diff --git a/loginutils/login.c b/loginutils/login.c
index 3531d1424..c3a835180 100644
--- a/loginutils/login.c
+++ b/loginutils/login.c
@@ -505,7 +505,7 @@ int login_main(int argc UNUSED_PARAM, char **argv)
 #endif /* ENABLE_PAM */
  auth_failed:
 		opt &= ~LOGIN_OPT_f;
-		bb_do_delay(LOGIN_FAIL_DELAY);
+		pause_after_failed_login();
 		/* TODO: doesn't sound like correct English phrase to me */
 		puts("Login incorrect");
 		if (++count == 3) {
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index 6c643d3d0..770acf58a 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -57,7 +57,7 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo
 		encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */
 		if (strcmp(encrypted, pw->pw_passwd) != 0) {
 			syslog(LOG_WARNING, "incorrect password for %s", pw->pw_name);
-			bb_do_delay(LOGIN_FAIL_DELAY);
+			pause_after_failed_login();
 			puts("Incorrect password");
 			goto err_ret;
 		}
diff --git a/loginutils/su.c b/loginutils/su.c
index 7c1fc69c5..6f91039f9 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -146,7 +146,7 @@ int su_main(int argc UNUSED_PARAM, char **argv)
 		if (ENABLE_FEATURE_SU_SYSLOG)
 			syslog(LOG_NOTICE, "%c %s %s:%s",
 				'-', tty, old_user, opt_username);
-		bb_do_delay(LOGIN_FAIL_DELAY);
+		pause_after_failed_login();
 		bb_simple_error_msg_and_die("incorrect password");
 	}
 
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index 099085340..48dafd186 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -74,7 +74,7 @@ int sulogin_main(int argc UNUSED_PARAM, char **argv)
 		if (r > 0) {
 			break;
 		}
-		bb_do_delay(LOGIN_FAIL_DELAY);
+		pause_after_failed_login();
 		bb_simple_info_msg("Login incorrect");
 	}
 
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index 9e319fe61..334b7d2ad 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -120,7 +120,7 @@ int vlock_main(int argc UNUSED_PARAM, char **argv)
 		if (ask_and_check_password(pw) > 0) {
 			break;
 		}
-		bb_do_delay(LOGIN_FAIL_DELAY);
+		pause_after_failed_login();
 		puts("Incorrect password");
 	}
 
diff --git a/networking/pscan.c b/networking/pscan.c
index 2715ef2df..e114e55d2 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -139,7 +139,7 @@ int pscan_main(int argc UNUSED_PARAM, char **argv)
 			 * We check rtt BEFORE we usleep, otherwise
 			 * on localhost we'll have no writes done (!)
 			 * before we exceed (rather small) rtt */
-			usleep(rtt_4/8);
+			usleep(rtt_4 / 8);
  open:
 			diff = MONOTONIC_US() - start;
 			DMSG("write to port %u @%u", port, diff - start);