aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-11-18 14:46:49 +0000
committerUlrich Drepper <drepper@redhat.com>1998-11-18 14:46:49 +0000
commitdfd2464b33ddfcd2706191a340d1737548c5ed19 (patch)
tree9ae7d67d98f13d9c38c54dc97f53ffc5b72c0807 /sysdeps
parent090ca0002ff8ee4ca425bc6088cc097f46c67626 (diff)
downloadglibc-dfd2464b33ddfcd2706191a340d1737548c5ed19.tar
glibc-dfd2464b33ddfcd2706191a340d1737548c5ed19.tar.gz
glibc-dfd2464b33ddfcd2706191a340d1737548c5ed19.tar.bz2
glibc-dfd2464b33ddfcd2706191a340d1737548c5ed19.zip
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.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/gnu/errlist.c2
-rw-r--r--sysdeps/unix/bsd/poll.c26
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h8
-rw-r--r--sysdeps/unix/sysv/linux/cmsg_nxthdr.c15
4 files changed, 40 insertions, 11 deletions
diff --git a/sysdeps/gnu/errlist.c b/sysdeps/gnu/errlist.c
index a0ae14af82..2f81a7d786 100644
--- a/sysdeps/gnu/errlist.c
+++ b/sysdeps/gnu/errlist.c
@@ -144,7 +144,7 @@ TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}). *
/*
TRANS The wrong type of device was given to a function that expects a
TRANS particular sort of device. */
- [ERR_REMAP (ENODEV)] = N_("Operation not supported by device"),
+ [ERR_REMAP (ENODEV)] = N_("No such device"),
#endif
#ifdef ENOTDIR
/*
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)
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 30ba59fc57..74b4ca2ee1 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -194,11 +194,12 @@ struct cmsghdr
+ CMSG_ALIGN (sizeof (struct cmsghdr)))
#define CMSG_LEN(len) (CMSG_ALIGN (sizeof (struct cmsghdr)) + (len))
-#ifndef _EXTERN_INLINE
-# define _EXTERN_INLINE extern __inline
-#endif
extern struct cmsghdr *__cmsg_nxthdr __P ((struct msghdr *__mhdr,
struct cmsghdr *__cmsg));
+#ifdef __USE_EXTERN_INLINES
+# ifndef _EXTERN_INLINE
+# define _EXTERN_INLINE extern __inline
+# endif
_EXTERN_INLINE struct cmsghdr *
__cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg) __THROW
{
@@ -216,6 +217,7 @@ __cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg) __THROW
return NULL;
return __cmsg;
}
+#endif /* Use `extern inline'. */
/* Socket level message types. This must match the definitions in
<linux/socket.h>. */
diff --git a/sysdeps/unix/sysv/linux/cmsg_nxthdr.c b/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
index 2245db7f25..fda37f37aa 100644
--- a/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
+++ b/sysdeps/unix/sysv/linux/cmsg_nxthdr.c
@@ -1,5 +1,5 @@
/* Return point to next ancillary data entry in message header.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -23,16 +23,17 @@
struct cmsghdr *
__cmsg_nxthdr (struct msghdr *mhdr, struct cmsghdr *cmsg)
{
- unsigned char *p;
-
if ((size_t) cmsg->cmsg_len < sizeof (struct cmsghdr))
/* The kernel header does this so there may be a reason. */
return NULL;
- p = (((unsigned char *) cmsg)
- + ((cmsg->cmsg_len + sizeof (long int) - 1) & ~sizeof (long int)));
- if (p >= (unsigned char *) mhdr->msg_control + mhdr->msg_controllen)
+ cmsg = (struct cmsghdr *) ((unsigned char *) cmsg
+ + CMSG_ALIGN (cmsg->cmsg_len));
+ if ((unsigned char *) (cmsg + 1) >= ((unsigned char *) mhdr->msg_control
+ + mhdr->msg_controllen)
+ || ((unsigned char *) cmsg + CMSG_ALIGN (cmsg->cmsg_len)
+ >= ((unsigned char *) mhdr->msg_control + mhdr->msg_controllen)))
/* No more entries. */
return NULL;
- return (struct cmsghdr *) p;
+ return cmsg;
}