summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorJoachim Schmitz <jojo@schmitz-digital.de>2012-09-17 21:24:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-17 22:44:20 (GMT)
commita6772946a554ad97ea4f6febbff3b98fbaa2f5bf (patch)
tree702b4f205fc42f641d442deb1210e3f6cb853a09 /compat
parent32fde6575e4139710ea5259ee9b7c750b7c2dde0 (diff)
downloadgit-a6772946a554ad97ea4f6febbff3b98fbaa2f5bf.zip
git-a6772946a554ad97ea4f6febbff3b98fbaa2f5bf.tar.gz
git-a6772946a554ad97ea4f6febbff3b98fbaa2f5bf.tar.bz2
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>
Diffstat (limited to 'compat')
-rw-r--r--compat/poll/poll.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index e4b8319..7d226ec 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;
}