diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-05-17 13:24:20 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <dev@ddvo.net> | 2021-05-18 14:49:33 +0200 |
| commit | 9be5f9a8698b0d902ef1281716eda73a4d8478ed (patch) | |
| tree | 9a6fae021f6d21482b78768b97105da1495e613a /apps | |
| parent | 78c44e4f819721eb80ad95fddc360a34f9e93118 (diff) | |
Move ossl_sleep() to e_os.h and use it in apps
Fixes #15304
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15308)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/cmp.c | 2 | ||||
| -rw-r--r-- | apps/lib/http_server.c | 6 | ||||
| -rw-r--r-- | apps/s_server.c | 8 |
3 files changed, 6 insertions, 10 deletions
diff --git a/apps/cmp.c b/apps/cmp.c index 70ca9a34fd..f289943a55 100644 --- a/apps/cmp.c +++ b/apps/cmp.c @@ -2705,7 +2705,7 @@ int cmp_main(int argc, char **argv) prog, opt_port, 0, 0); if (ret == 0) { /* no request yet */ if (retry) { - sleep(1); + ossl_sleep(1000); retry = 0; continue; } diff --git a/apps/lib/http_server.c b/apps/lib/http_server.c index e7e84fa4c5..b39f218507 100644 --- a/apps/lib/http_server.c +++ b/apps/lib/http_server.c @@ -96,7 +96,7 @@ static void killall(int ret, pid_t *kidpids) if (kidpids[i] != 0) (void)kill(kidpids[i], SIGTERM); OPENSSL_free(kidpids); - sleep(1); + ossl_sleep(1000); exit(ret); } @@ -166,7 +166,7 @@ void spawn_loop(const char *prog) WCOREDUMP(status) ? " (core dumped)" : # endif ""); - sleep(1); + ossl_sleep(1000); } break; } else if (errno != EINTR) { @@ -180,7 +180,7 @@ void spawn_loop(const char *prog) switch (fpid = fork()) { case -1: /* error */ /* System critically low on memory, pause and try again later */ - sleep(30); + ossl_sleep(30000); break; case 0: /* child */ OPENSSL_free(kidpids); diff --git a/apps/s_server.c b/apps/s_server.c index 80c8a08c01..292ffbe762 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -3057,9 +3057,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context) continue; } #endif -#if !defined(OPENSSL_SYS_MSDOS) - sleep(1); -#endif + ossl_sleep(1000); continue; } } else if (i == 0) { /* end of input */ @@ -3486,9 +3484,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context) continue; } #endif -#if !defined(OPENSSL_SYS_MSDOS) - sleep(1); -#endif + ossl_sleep(1000); continue; } } else if (i == 0) { /* end of input */ |