diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-12-04 21:09:29 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-12-04 21:09:29 +0100 |
| commit | 9ed346beee1ee1d14eb314e0177b288119e5158f (patch) | |
| tree | c7efd153efca901c339e3a590aba2170144c2006 | |
| parent | c36eb7f102fc0e7964444968bd63a4eb1615034f (diff) | |
| parent | cd6270c19d6b961e77c41823e82e2e76ddc789c8 (diff) | |
Merge branch 't/poll_errors_fixes' into refs/top-bases/tschwinge/Roger_Whittaker
| -rw-r--r-- | hurd/hurdselect.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c index e9e9b3e85b..dcda71b63f 100644 --- a/hurd/hurdselect.c +++ b/hurd/hurdselect.c @@ -288,7 +288,9 @@ _hurd_select (int nfds, portset = MACH_PORT_NULL; for (i = firstfd; i <= lastfd; ++i) - if (d[i].type & ~SELECT_ERROR) + if (d[i].type & SELECT_ERROR) + d[i].reply_port = MACH_PORT_NULL; + else { int type = d[i].type; d[i].reply_port = __mach_reply_port (); @@ -491,7 +493,7 @@ _hurd_select (int nfds, if (firstfd != -1) for (i = firstfd; i <= lastfd; ++i) - if (d[i].type & ~(SELECT_ERROR | SELECT_RETURNED)) + if (d[i].reply_port != MACH_PORT_NULL) __mach_port_destroy (__mach_task_self (), d[i].reply_port); if (firstfd == -1 || (firstfd != lastfd && portset != MACH_PORT_NULL)) /* Destroy PORTSET, but only if it's not actually the reply port for a |