forks/tftp-hpa-google
1
0
Fork 0
forked from mirrors/tftp-hpa-google
Code Pull requests Releases 1 Activity

signals: require and always use sigaction()

Browse source 
tftpd already requires sigaction() to compile, so there is no reason
to use anything else. It also allows for nicer combination of flags.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2024-06-10 14:36:28 -07:00
parent e52af4207a
commit 33051a296c
6 changed files with 22 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tftp/main.c
View file

@ -305,7 +305,7 @@ int main(int argc, char *argv[])
sp->s_proto = (char *)"udp";
}
tftp_signal(SIGINT, intr);
tftp_signal(SIGINT, intr, 0);
if (peerargc) {
/* Set peer */
@ -768,8 +768,8 @@ void intr(int sig)
{
(void)sig; /* Quiet unused warning */
tftp_signal(SIGALRM, SIG_IGN);
alarm(0);
tftp_signal(SIGALRM, SIG_DFL, 0);
siglongjmp(toplevel, -1);
}

4
tftp/tftp.c
View file

@ -84,7 +84,7 @@ void tftp_sendfile(int fd, const char *name, const char *mode)
is_request = 1; /* First packet is the actual WRQ */
amount = 0;
tftp_signal(SIGALRM, timer);
tftp_signal(SIGALRM, timer, 0);
do {
if (is_request) {
size = makerequest(WRQ, name, dp, mode) - 4;
@ -190,7 +190,7 @@ void tftp_recvfile(int fd, const char *name, const char *mode)
firsttrip = 1;
amount = 0;
tftp_signal(SIGALRM, timer);
tftp_signal(SIGALRM, timer, 0);
do {
if (firsttrip) {
size = makerequest(RRQ, name, ap, mode);