Update.

	* sysdeps/unix/bsd/poll.c (__poll): Add code to extend sets if any
	passed file descriptor exceeds the size determined by
	getdtablesize.

	* sysdeps/unix/sysv/linux/cmsg_nxthdr.c (__cmsg_nxthdr): Update
	from inline version in bits/socket.h.

	* sysdeps/unix/sysv/linux/bits/socket.h: Define __cmsg_nxthdr as
	inline function only is __USE_EXTERN_INLINES is defined.

	* time/strftime.c (my_strftime): Make code a bit clearer.
	Patch by Paul Eggert <eggert@twinsun.com>.

	by removing SIG_IGN handler for SIGCHLD if necessary.

1 files changed, 26 insertions, 0 deletions

diff --git a/sysdeps/unix/bsd/poll.c b/sysdeps/unix/bsd/poll.c
index 23ae6e21be..7fb4fcc3fa 100644
--- a/sysdeps/unix/bsd/poll.c
+++ b/sysdeps/unix/bsd/poll.c
@@ -62,6 +62,32 @@ __poll (fds, nfds, timeout)
   for (f = fds; f < &fds[nfds]; ++f)
     if (f->fd >= 0)
       {
+	if (f->fd >= max_fd_size)
+	  {
+	    /* The user provides a file descriptor number which is higher
+	       than the maximum we got from the `getdtablesize' call.
+	       Maybe this is ok so enlarge the arrays.  */
+	    fd_set *nrset, *nwset, *nxset;
+	    int nbytes;
+
+	    max_fd_size = roundup (f->fd, __NFDBITS);
+	    nbytes = howmany (max_fd_size, __NFDBITS);
+
+	    nrset = alloca (nbytes);
+	    nwset = alloca (nbytes);
+	    nxset = alloca (nbytes);
+
+	    __bzero ((char *) nrset + bytes, nbytes - bytes);
+	    __bzero ((char *) nwset + bytes, nbytes - bytes);
+	    __bzero ((char *) nxset + bytes, nbytes - bytes);
+
+	    rset = memcpy (nrset, rset, bytes);
+	    wset = memcpy (nwset, wset, bytes);
+	    xset = memcpy (nxset, xset, bytes);
+
+	    bytes = nbytes;
+	  }
+
 	if (f->events & POLLIN)
 	  FD_SET (f->fd, rset);
 	if (f->events & POLLOUT)