From 5716ed40b2051aceccbf472a59b967a91ef55d00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amadeusz=20S=C5=82awi=C5=84ski?= Date: Thu, 13 Apr 2017 09:40:11 +0200 Subject: use library sleep functions --- src/display.c | 3 ++- src/misc.c | 9 --------- src/misc.h | 1 - src/tty.c | 5 +++-- 4 files changed, 5 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/display.c b/src/display.c index 0c40f49..813b8f1 100644 --- a/src/display.c +++ b/src/display.c @@ -36,6 +36,7 @@ #include #include #include +#include #include "screen.h" @@ -2308,7 +2309,7 @@ void DisplaySleep1000(int n, int eat) if (n <= 0) return; if (!display) { - sleep1000(n); + usleep(1000 * n); return; } t.tv_usec = (n % 1000) * 1000; diff --git a/src/misc.c b/src/misc.c index 5400363..588fbb8 100644 --- a/src/misc.c +++ b/src/misc.c @@ -218,12 +218,3 @@ int AddXChars(char *buf, int len, char *str) *p = 0; return p - buf; } - -void sleep1000(int msec) -{ - struct timeval t; - - t.tv_sec = (long)(msec / 1000); - t.tv_usec = (long)((msec % 1000) * 1000); - select(0, (fd_set *) 0, (fd_set *) 0, (fd_set *) 0, &t); -} diff --git a/src/misc.h b/src/misc.h index ca28ab3..8e7d9f4 100644 --- a/src/misc.h +++ b/src/misc.h @@ -27,6 +27,5 @@ void xsetegid (int); #endif int AddXChar (char *, int); int AddXChars (char *, int, char *); -void sleep1000 (int); #endif /* SCREEN_MISC_H */ diff --git a/src/tty.c b/src/tty.c index 67702b6..09eb2c2 100644 --- a/src/tty.c +++ b/src/tty.c @@ -39,6 +39,7 @@ #include #include #include +#include #include "screen.h" #include "fileio.h" @@ -673,7 +674,7 @@ static void DoSendBreak(int fd, int n, int type) Msg(errno, "Can't send BREAK (TIOCSBRK)"); return; } - sleep1000(n ? n * 250 : 250); + usleep(1000 * (n ? n * 250 : 250)); if (ioctl(fd, TIOCCBRK, (char *)0) < 0) { Msg(errno, "BREAK stuck!!! -- HELP! (TIOCCBRK)"); return; @@ -710,7 +711,7 @@ void SendBreak(Window * wp, int n, int closeopen) if (closeopen) { close(wp->w_ptyfd); - sleep1000(n ? n * 250 : 250); + usleep(1000 * (n ? n * 250 : 250)); if ((wp->w_ptyfd = OpenTTY(wp->w_tty, wp->w_cmdargs[1])) < 1) { Msg(0, "Ouch, cannot reopen line %s, please try harder", wp->w_tty); return; -- cgit v1.2.1