GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: Use better error code when using select with a too high fd.

Browse Source 
* src/posix-io.c (_gpgme_io_select): Return EMFILE instead of EBADF.
--

Also EBADF seem more correct, EMFILE (Too man open files) gives
a clearer message to the user that there are somehow too many files
open.  The problem can be exhibited by running lots of threads,

We should eventually move to poll but that would be a large change and
so we better fix it with the planned migration of the I/O subsystem to
libgpgrt (currently known as libgpg-error).

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-11-10 19:49:13 +01:00
parent ddd0a3cf90
commit 6e57379c8e
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/posix-io.c
View File

@ -607,7 +607,7 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
if (fds[i].fd >= FD_SETSIZE) if (fds[i].fd >= FD_SETSIZE)
{ {
TRACE_END (dbg_help, " -BAD- ]"); TRACE_END (dbg_help, " -BAD- ]");
gpg_err_set_errno (EBADF); gpg_err_set_errno (EMFILE);
return TRACE_SYSRES (-1); return TRACE_SYSRES (-1);
} }
assert (!FD_ISSET (fds[i].fd, &readfds)); assert (!FD_ISSET (fds[i].fd, &readfds));
@ -622,7 +622,7 @@ _gpgme_io_select (struct io_select_fd_s *fds, size_t nfds, int nonblock)
if (fds[i].fd >= FD_SETSIZE) if (fds[i].fd >= FD_SETSIZE)
{ {
TRACE_END (dbg_help, " -BAD- ]"); TRACE_END (dbg_help, " -BAD- ]");
gpg_err_set_errno (EBADF); gpg_err_set_errno (EMFILE);
return TRACE_SYSRES (-1); return TRACE_SYSRES (-1);
} }
assert (!FD_ISSET (fds[i].fd, &writefds)); assert (!FD_ISSET (fds[i].fd, &writefds));