crewID/libnfc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make a copy of the provided timeout before calling select(2).

Browse source
This commit is contained in:
Romain Tartiere 2011-09-29 15:01:48 +00:00
parent 8f7834c625
commit 311d12feef
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libnfc/buses/uart_posix.c
View file

@ -267,6 +267,16 @@ select:
FD_SET (iAbortFd, &rfds); FD_SET (iAbortFd, &rfds);
} }
/*
* Some implementations (e.g. Linux) of select(2) will update *timeout.
* Make a copy so that it will be updated on these systems,
*/
struct timeval fixed_timeout;
if (timeout) {
fixed_timeout = *timeout;
timeout = &fixed_timeout;
}
res = select (MAX(((serial_port_unix *) sp)->fd, iAbortFd) + 1, &rfds, NULL, NULL, timeout); res = select (MAX(((serial_port_unix *) sp)->fd, iAbortFd) + 1, &rfds, NULL, NULL, timeout);
if ((res < 0) && (EINTR == errno)) { if ((res < 0) && (EINTR == errno)) {