r5045 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2011-11-28 09:25:41 +0000 (Mon, 28 Nov 2011)
New Revision: 5045
Added:
glibc-package/trunk/debian/patches/hurd-i386/local-select.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
local-select.diff: New patch to fix select with a zero timeout.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-11-27 01:24:37 UTC (rev 5044)
+++ glibc-package/trunk/debian/changelog 2011-11-28 09:25:41 UTC (rev 5045)
@@ -50,6 +50,8 @@
* libc0.3.symbols.hurd-i386: Drop removed unused xxx_ and yyy_ RPCs.
* patches/hurd-i386/submitted-hurd-recvfrom.diff: New patch from Pino
Toscano to fix recvfrom on socketpair.
+ * patches/hurd-i386/local-select.diff: New patch to fix select with a zero
+ timeout.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 3763 (from glibc-bsd).
Added: glibc-package/trunk/debian/patches/hurd-i386/local-select.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-select.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-select.diff 2011-11-28 09:25:41 UTC (rev 5045)
@@ -0,0 +1,27 @@
+http://bugs.debian.org/79358
+
+this is not a proper fix, but should unbreak quite a few things.
+
+--
+ hurdselect.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+diff --git a/hurd/hurdselect.c b/hurd/hurdselect.c
+index a7228f0..7afe22c 100644
+--- a/hurd/hurdselect.c
++++ b/hurd/hurdselect.c
+@@ -75,6 +75,15 @@ _hurd_select (int nfds,
+ if (sigmask && __sigprocmask (SIG_SETMASK, sigmask, &oset))
+ return -1;
+
++ if (timeout == NULL)
++ to = 0;
++ else
++ {
++ to = timeout->tv_sec * 1000 + (timeout->tv_nsec + 999999) / 1000000;
++ if (!to)
++ to = 1;
++ }
++
+ if (pollfds)
+ {
+ /* Collect interesting descriptors from the user's `pollfd' array.
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-11-27 01:24:37 UTC (rev 5044)
+++ glibc-package/trunk/debian/patches/series 2011-11-28 09:25:41 UTC (rev 5045)
@@ -164,6 +164,7 @@
hurd-i386/cvs-sgttyb.diff
hurd-i386/submitted-_hurd_socket_server-indexcheck.diff
hurd-i386/submitted-hurd-recvfrom.diff
+hurd-i386/local-select.diff
kfreebsd/submitted-libc_once.diff
Reply to: