emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: fix sleep built-in not running INT trap immediately on ^C

Browse Source 
function                                             old     new   delta
sleep_for_duration                                   169     149     -20

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2023-04-10 16:30:27 +02:00
parent d661cb1977
commit ce839dea92
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libbb/duration.c
View File

@ -76,16 +76,14 @@ void FAST_FUNC sleep_for_duration(duration_t duration)
ts.tv_sec = duration; ts.tv_sec = duration;
ts.tv_nsec = (duration - ts.tv_sec) * 1000000000; ts.tv_nsec = (duration - ts.tv_sec) * 1000000000;
} }
/* NB: if ENABLE_ASH_SLEEP, we end up here if "sleep N" /* NB: ENABLE_ASH_SLEEP requires that we do NOT loop on EINTR here:
* is run in ash. ^C will still work, because ash's signal handler * otherwise, traps won't execute until we finish looping.
* does not return (it longjumps), the below loop
* will not continue looping.
* (This wouldn't work in hush)
*/ */
do { //do {
errno = 0; // errno = 0;
nanosleep(&ts, &ts); // nanosleep(&ts, &ts);
} while (errno == EINTR); //} while (errno == EINTR);
nanosleep(&ts, &ts);
} }
#else #else
duration_t FAST_FUNC parse_duration_str(char *str) duration_t FAST_FUNC parse_duration_str(char *str)