pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-08-09 11:40:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20210305 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2021-03-10 10:35:28 -05:00
parent b3b5f4bb33
commit 11bf534f36
16 changed files with 416 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/readline/posixtime.h
Symlink
+1
View File
@@ -0,0 +1 @@
../../include/posixtime.h
lib/sh/timers.c
+5 -5
View File
@@ -106,14 +106,13 @@ shtimer_set (sh_timer *t, time_t sec, long usec)
t->old_handler = set_signal_handler (SIGALRM, t->alrm_handler);
t->flags |= SHTIMER_SIGSET;
falarm (t->tmout.tv_sec = sec, t->tmout.tv_usec = usec);
t->flags |= SHTIMER_ALRMSET;
return;
}
if (gettimeofday (&now, 0) < 0)
{
now.tv_sec = 0;
now.tv_usec = 0;
}
timerclear (&now);
t->tmout.tv_sec = now.tv_sec + sec;
t->tmout.tv_usec = now.tv_usec + usec;
if (t->tmout.tv_usec > USEC_PER_SEC)
@@ -132,7 +131,8 @@ shtimer_unset (sh_timer *t)
if (t->flags & SHTIMER_ALARM)
{
t->alrmflag = 0;
falarm (0, 0);
if (t->flags & SHTIMER_ALRMSET)
falarm (0, 0);
if (t->old_handler && (t->flags & SHTIMER_SIGSET))
{
set_signal_handler (SIGALRM, t->old_handler);