diff options
author | Amadeusz Sławiński <amade@asmblr.net> | 2017-04-13 09:40:11 +0200 |
---|---|---|
committer | Amadeusz Sławiński <amade@asmblr.net> | 2017-04-13 09:40:11 +0200 |
commit | 5716ed40b2051aceccbf472a59b967a91ef55d00 (patch) | |
tree | 3fa3c8aeec8d90f88eaaa86cd116fec6829f40c8 /src | |
parent | ec9b396fce5dbe9ff1e63134194836647cc28ec9 (diff) | |
download | screen-5716ed40b2051aceccbf472a59b967a91ef55d00.tar.gz |
use library sleep functions
Diffstat (limited to 'src')
-rw-r--r-- | src/display.c | 3 | ||||
-rw-r--r-- | src/misc.c | 9 | ||||
-rw-r--r-- | src/misc.h | 1 | ||||
-rw-r--r-- | src/tty.c | 5 |
4 files changed, 5 insertions, 13 deletions
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 <sys/ioctl.h> #include <stdbool.h> #include <stdint.h> +#include <unistd.h> #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; @@ -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); -} @@ -27,6 +27,5 @@ void xsetegid (int); #endif int AddXChar (char *, int); int AddXChars (char *, int, char *); -void sleep1000 (int); #endif /* SCREEN_MISC_H */ @@ -39,6 +39,7 @@ #include <sys/stat.h> #include <sys/file.h> #include <sys/ioctl.h> +#include <unistd.h> #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; |