diff options
| author |  Joachim Schmitz <jojo@schmitz-digital.de> | 2012-09-17 23:24:42 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-09-17 15:44:20 -0700 |
| commit | a6772946a554ad97ea4f6febbff3b98fbaa2f5bf (patch) | |
| tree | 702b4f205fc42f641d442deb1210e3f6cb853a09 | |
| parent | poll() exits too early with EFAULT if 1st arg is NULL (diff) | |
| download | tgif-a6772946a554ad97ea4f6febbff3b98fbaa2f5bf.tar.xz | |
make poll() work on platforms that can't recv() on a non-socket
This way it just got added to gnulib too the other day.
Signed-off-by: Joachim Schmitz <jojo@schmitz-digital.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | compat/poll/poll.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compat/poll/poll.c b/compat/poll/poll.c index e4b8319fb7..7d226ecb29 100644 --- a/compat/poll/poll.c +++ b/compat/poll/poll.c @@ -306,6 +306,10 @@ compute_revents (int fd, int sought, fd_set *rfds, fd_set *wfds, fd_set *efds) || socket_errno == ECONNABORTED || socket_errno == ENETRESET) happened |= POLLHUP; + /* some systems can't use recv() on non-socket, including HP NonStop */ + else if (/* (r == -1) && */ socket_errno == ENOTSOCK) + happened |= (POLLIN | POLLRDNORM) & sought; + else happened |= POLLERR; } |