kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Fix select(2) error and end of file handling.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2017-03-06 23:27:46 +01:00
parent 955406a3ed
commit eb7d0f4dd4
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libc/sys/select/select.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, 2016 Jonas 'Sortie' Termansen. * Copyright (c) 2013, 2016, 2017 Jonas 'Sortie' Termansen.
* *
* Permission to use, copy, modify, and distribute this software for any * Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -21,9 +21,10 @@
#include <errno.h> #include <errno.h>
#include <poll.h> #include <poll.h>
#include <string.h>
static const int READ_EVENTS = POLLIN | POLLRDNORM; static const int READ_EVENTS = POLLIN | POLLRDNORM | POLLERR | POLLHUP;
static const int WRITE_EVENTS = POLLOUT | POLLWRNORM; static const int WRITE_EVENTS = POLLOUT | POLLWRNORM | POLLERR;
static const int EXCEPT_EVENTS = POLLERR | POLLHUP; static const int EXCEPT_EVENTS = POLLERR | POLLHUP;
int select(int nfds, fd_set* restrict readfds, fd_set* restrict writefds, int select(int nfds, fd_set* restrict readfds, fd_set* restrict writefds,
@ -45,20 +46,11 @@ int select(int nfds, fd_set* restrict readfds, fd_set* restrict writefds,
fds[fds_count].fd = i; fds[fds_count].fd = i;
fds[fds_count].events = fds[fds_count].revents = 0; fds[fds_count].events = fds[fds_count].revents = 0;
if ( readfds && FD_ISSET(i, readfds) ) if ( readfds && FD_ISSET(i, readfds) )
{
FD_CLR(i, readfds);
fds[fds_count].events |= READ_EVENTS; fds[fds_count].events |= READ_EVENTS;
}
if ( writefds && FD_ISSET(i, writefds) ) if ( writefds && FD_ISSET(i, writefds) )
{
FD_CLR(i, writefds);
fds[fds_count].events |= WRITE_EVENTS; fds[fds_count].events |= WRITE_EVENTS;
}
if ( exceptfds && FD_ISSET(i, exceptfds) ) if ( exceptfds && FD_ISSET(i, exceptfds) )
{
FD_CLR(i, exceptfds);
fds[fds_count].events |= EXCEPT_EVENTS; fds[fds_count].events |= EXCEPT_EVENTS;
}
if ( fds[fds_count].events ) if ( fds[fds_count].events )
fds_count++; fds_count++;
} }
@ -73,6 +65,12 @@ int select(int nfds, fd_set* restrict readfds, fd_set* restrict writefds,
int num_occur = ppoll(fds, fds_count, timeout_tsp, NULL); int num_occur = ppoll(fds, fds_count, timeout_tsp, NULL);
if ( num_occur < 0 ) if ( num_occur < 0 )
return -1; return -1;
if ( readfds )
memset(readfds, 0, sizeof(*readfds));
if ( writefds )
memset(writefds, 0, sizeof(*writefds));
if ( exceptfds )
memset(exceptfds, 0, sizeof(*exceptfds));
int ret = 0; int ret = 0;
for ( nfds_t i = 0; i < fds_count; i++ ) for ( nfds_t i = 0; i < fds_count; i++ )
{ {