aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/fstatvfs64.c1
-rw-r--r--sysdeps/generic/statvfs64.c1
-rw-r--r--sysdeps/libm-ieee754/e_acos.c2
-rw-r--r--sysdeps/libm-ieee754/e_asin.c2
-rw-r--r--sysdeps/unix/bsd/poll.c38
-rw-r--r--sysdeps/unix/sysv/linux/Dist3
-rw-r--r--sysdeps/unix/sysv/linux/Makefile4
-rw-r--r--sysdeps/unix/sysv/linux/__recvmsg.S (renamed from sysdeps/unix/sysv/linux/recvmsg.S)4
-rw-r--r--sysdeps/unix/sysv/linux/__sendmsg.S (renamed from sysdeps/unix/sysv/linux/sendmsg.S)4
-rw-r--r--sysdeps/unix/sysv/linux/aio_sigqueue.c5
-rw-r--r--sysdeps/unix/sysv/linux/bits/sched.h4
-rw-r--r--sysdeps/unix/sysv/linux/bits/socket.h26
-rw-r--r--sysdeps/unix/sysv/linux/recvmsg.c93
-rw-r--r--sysdeps/unix/sysv/linux/sendmsg.c91
14 files changed, 248 insertions, 30 deletions
diff --git a/sysdeps/generic/fstatvfs64.c b/sysdeps/generic/fstatvfs64.c
index a96c7bdec2..8ede56eec3 100644
--- a/sysdeps/generic/fstatvfs64.c
+++ b/sysdeps/generic/fstatvfs64.c
@@ -19,6 +19,7 @@
#include <errno.h>
#include <sys/statvfs.h>
+#include <string.h>
/* Return information about the filesystem on which FD resides. */
int
diff --git a/sysdeps/generic/statvfs64.c b/sysdeps/generic/statvfs64.c
index 349760362b..d88bd5945b 100644
--- a/sysdeps/generic/statvfs64.c
+++ b/sysdeps/generic/statvfs64.c
@@ -20,6 +20,7 @@
#include <errno.h>
#include <sys/statvfs.h>
#include <stddef.h>
+#include <string.h>
/* Return information about the filesystem on which FILE resides. */
int
diff --git a/sysdeps/libm-ieee754/e_acos.c b/sysdeps/libm-ieee754/e_acos.c
index fa858defc5..eb4080a8b8 100644
--- a/sysdeps/libm-ieee754/e_acos.c
+++ b/sysdeps/libm-ieee754/e_acos.c
@@ -71,7 +71,7 @@ qS[] ={1.0, -2.40339491173441421878e+00, /* 0xC0033A27, 0x1C8A2D4B */
double x;
#endif
{
- double z,p,q,r,w,s,c,df,p1,p2,p3,q1,q2,q3,z2,z4,z6;
+ double z,p,q,r,w,s,c,df,p1,p2,p3,q1,q2,z2,z4,z6;
int32_t hx,ix;
GET_HIGH_WORD(hx,x);
ix = hx&0x7fffffff;
diff --git a/sysdeps/libm-ieee754/e_asin.c b/sysdeps/libm-ieee754/e_asin.c
index 65dc318db3..aa19598848 100644
--- a/sysdeps/libm-ieee754/e_asin.c
+++ b/sysdeps/libm-ieee754/e_asin.c
@@ -79,7 +79,7 @@ qS[] = {1.0, -2.40339491173441421878e+00, /* 0xC0033A27, 0x1C8A2D4B */
double x;
#endif
{
- double t,w,p,q,c,r,s,p1,p2,p3,q1,q2,q3,z2,z4,z6;
+ double t,w,p,q,c,r,s,p1,p2,p3,q1,q2,z2,z4,z6;
int32_t hx,ix;
GET_HIGH_WORD(hx,x);
ix = hx&0x7fffffff;
diff --git a/sysdeps/unix/bsd/poll.c b/sysdeps/unix/bsd/poll.c
index e92b718022..23ae6e21be 100644
--- a/sysdeps/unix/bsd/poll.c
+++ b/sysdeps/unix/bsd/poll.c
@@ -16,11 +16,14 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+#include <alloca.h>
#include <sys/poll.h>
#include <sys/types.h>
#include <errno.h>
#include <string.h>
#include <sys/time.h>
+#include <sys/param.h>
+#include <unistd.h>
/* Poll the file descriptors described by the NFDS structures starting at
FDS. If TIMEOUT is nonzero and not -1, allow TIMEOUT milliseconds for
@@ -34,25 +37,37 @@ __poll (fds, nfds, timeout)
unsigned long int nfds;
int timeout;
{
+ static int max_fd_size;
struct timeval tv;
- fd_set rset, wset, xset;
+ fd_set *rset, *wset, *xset;
struct pollfd *f;
int ready;
int maxfd = 0;
+ int bytes;
- FD_ZERO (&rset);
- FD_ZERO (&wset);
- FD_ZERO (&xset);
+ if (!max_fd_size)
+ max_fd_size = __getdtablesize ();
+
+ bytes = howmany (max_fd_size, __NFDBITS);
+ rset = alloca (bytes);
+ wset = alloca (bytes);
+ xset = alloca (bytes);
+
+ /* We can't call FD_ZERO, since FD_ZERO only works with sets
+ of exactly __FD_SETSIZE size. */
+ __bzero (rset, bytes);
+ __bzero (wset, bytes);
+ __bzero (xset, bytes);
for (f = fds; f < &fds[nfds]; ++f)
if (f->fd >= 0)
{
if (f->events & POLLIN)
- FD_SET (f->fd, &rset);
+ FD_SET (f->fd, rset);
if (f->events & POLLOUT)
- FD_SET (f->fd, &wset);
+ FD_SET (f->fd, wset);
if (f->events & POLLPRI)
- FD_SET (f->fd, &xset);
+ FD_SET (f->fd, xset);
if (f->fd > maxfd && (f->events & (POLLIN|POLLOUT|POLLPRI)))
maxfd = f->fd;
}
@@ -60,19 +75,18 @@ __poll (fds, nfds, timeout)
tv.tv_sec = timeout / 1000;
tv.tv_usec = (timeout % 1000) * 1000;
- ready = __select (maxfd + 1, &rset, &wset, &xset,
- timeout == -1 ? NULL : &tv);
+ ready = __select (maxfd + 1, rset, wset, xset, timeout == -1 ? NULL : &tv);
if (ready > 0)
for (f = fds; f < &fds[nfds]; ++f)
{
f->revents = 0;
if (f->fd >= 0)
{
- if (FD_ISSET (f->fd, &rset))
+ if (FD_ISSET (f->fd, rset))
f->revents |= POLLIN;
- if (FD_ISSET (f->fd, &wset))
+ if (FD_ISSET (f->fd, wset))
f->revents |= POLLOUT;
- if (FD_ISSET (f->fd, &xset))
+ if (FD_ISSET (f->fd, xset))
f->revents |= POLLPRI;
}
}
diff --git a/sysdeps/unix/sysv/linux/Dist b/sysdeps/unix/sysv/linux/Dist
index 27b3077a65..89758cd3a8 100644
--- a/sysdeps/unix/sysv/linux/Dist
+++ b/sysdeps/unix/sysv/linux/Dist
@@ -1,3 +1,4 @@
+bits/pthreadtypes.h
stdio_lim.h.in
cmsg_nxthdr.c
errlist.h
@@ -74,3 +75,5 @@ sys/user.h
sys/vt.h
xstatconv.c
getdents64.c
+__sendmsg.S
+__recvmsg.S
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index ec42e776c0..7de1008716 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -58,7 +58,7 @@ ifeq ($(subdir),socket)
sysdep_headers += net/if.h net/if_ppp.h net/ppp-comp.h \
net/ppp_defs.h net/if_arp.h net/route.h net/ethernet.h \
net/if_slip.h net/if_packet.h
-sysdep_routines += cmsg_nxthdr sa_len
+sysdep_routines += cmsg_nxthdr sa_len __sendmsg __recvmsg
endif
ifeq ($(subdir),sunrpc)
@@ -75,7 +75,7 @@ inhibit-siglist := yes
endif
ifeq ($(subdir),posix)
-headers := bits/pthreadtypes.h
+sysdep_headers += bits/pthreadtypes.h
endif
ifeq ($(subdir),inet)
diff --git a/sysdeps/unix/sysv/linux/recvmsg.S b/sysdeps/unix/sysv/linux/__recvmsg.S
index 98be36be5b..515ff552aa 100644
--- a/sysdeps/unix/sysv/linux/recvmsg.S
+++ b/sysdeps/unix/sysv/linux/__recvmsg.S
@@ -1,5 +1,5 @@
-#define socket recvmsg
+#define socket __recvmsg
#define __socket __libc_recvmsg
+#define SOCKOP___recvmsg SOCKOP_recvmsg
#define NARGS 3
#include <socket.S>
-weak_alias (__libc_recvmsg, __recvmsg)
diff --git a/sysdeps/unix/sysv/linux/sendmsg.S b/sysdeps/unix/sysv/linux/__sendmsg.S
index c01d9b68e7..165ee14698 100644
--- a/sysdeps/unix/sysv/linux/sendmsg.S
+++ b/sysdeps/unix/sysv/linux/__sendmsg.S
@@ -1,5 +1,5 @@
-#define socket sendmsg
+#define socket __sendmsg
#define __socket __libc_sendmsg
+#define SOCKOP___sendmsg SOCKOP_sendmsg
#define NARGS 3
#include <socket.S>
-weak_alias (__libc_sendmsg, __sendmsg)
diff --git a/sysdeps/unix/sysv/linux/aio_sigqueue.c b/sysdeps/unix/sysv/linux/aio_sigqueue.c
index fc1187b443..5dea29fcf6 100644
--- a/sysdeps/unix/sysv/linux/aio_sigqueue.c
+++ b/sysdeps/unix/sysv/linux/aio_sigqueue.c
@@ -24,9 +24,6 @@
extern int __syscall_rt_sigqueueinfo (int, int, siginfo_t *);
-/* This variable is used quite often in the libc code. */
-extern pid_t __libc_pid;
-
/* Return any pending signal or wait for one for the given time. */
int
@@ -40,10 +37,8 @@ __aio_sigqueue (sig, val)
info.si_signo = sig;
info.si_errno = 0;
info.si_code = SI_ASYNCIO;
-
info.si_pid = getpid ();
info.si_uid = getuid ();
-
info.si_value = val;
return __syscall_rt_sigqueueinfo (info.si_pid, sig, &info);
diff --git a/sysdeps/unix/sysv/linux/bits/sched.h b/sysdeps/unix/sysv/linux/bits/sched.h
index c7f6d8d902..9d5d5e65df 100644
--- a/sysdeps/unix/sysv/linux/bits/sched.h
+++ b/sysdeps/unix/sysv/linux/bits/sched.h
@@ -57,6 +57,8 @@ extern int clone __P ((int (*__fn) (void *__arg), void *__child_stack,
int __flags, void *__arg));
#endif
+__END_DECLS
+
#endif /* need schedparam */
#if !defined __defined_schedparam \
@@ -69,5 +71,3 @@ struct __sched_param
};
# undef __need_schedparam
#endif
-
-__END_DECLS
diff --git a/sysdeps/unix/sysv/linux/bits/socket.h b/sysdeps/unix/sysv/linux/bits/socket.h
index 5517ba8803..c1f752ec29 100644
--- a/sysdeps/unix/sysv/linux/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/bits/socket.h
@@ -222,12 +222,32 @@ __cmsg_nxthdr (struct msghdr *__mhdr, struct cmsghdr *__cmsg)
<linux/socket.h>. */
enum
{
- SCM_RIGHTS = 0x01, /* Data array contains access rights. */
+ SCM_RIGHTS = 0x01, /* Transfer file descriptors. */
#define SCM_RIGHTS SCM_RIGHTS
- __SCM_CREDENTIALS = 0x02, /* Data array is `struct ucred'. */
- __SCM_CONNECT = 0x03 /* Data array is `struct scm_connect'. */
+#ifdef __USE_BSD
+ SCM_CREDS = 0x02, /* BSD-compatible credentials passing. */
+# define SCM_CREDS SCM_CREDS
+#endif
+ __SCM_CONNECT = 0x03, /* Data array is `struct scm_connect'. */
};
+#ifdef __USE_BSD
+
+/* User visible structure for SCM_CREDS message
+ (chosen for BSD source compatibility) */
+
+# define CMGROUP_MAX 16 /* Linux does not provide this info, so it doesn't
+ matter... use what bsd does. */
+struct cmsgcred
+{
+ pid_t cmcred_pid; /* PID of sending process. */
+ uid_t cmcred_uid; /* Real UID of sending process. */
+ uid_t cmcred_euid; /* Effective UID of sending process. */
+ gid_t cmcred_gid; /* Real GID of sending process. */
+ short int cmcred_ngroups; /* Number or groups. */
+ gid_t cmcred_groups[CMGROUP_MAX]; /* Groups. */
+};
+#endif
/* Get socket manipulation related informations from kernel headers. */
#include <asm/socket.h>
diff --git a/sysdeps/unix/sysv/linux/recvmsg.c b/sysdeps/unix/sysv/linux/recvmsg.c
new file mode 100644
index 0000000000..04cf230828
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/recvmsg.c
@@ -0,0 +1,93 @@
+/* Copyright (C) 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <sys/socket.h>
+#include <errno.h>
+#include <string.h>
+
+#include <asm/posix_types.h>
+
+/* The kernel expects this structure in SCM_CREDS messages.
+ * Note: sizeof(struct __kernel_ucred) <= sizeof(struct cmsgcred) must hold.
+ */
+struct __kernel_ucred
+{
+ __kernel_pid_t pid;
+ __kernel_uid_t uid;
+ __kernel_gid_t gid;
+};
+
+extern int __recvmsg (int, struct msghdr *, int);
+
+int
+recvmsg (fd, message, flags)
+ int fd;
+ struct msghdr *message;
+ int flags;
+{
+ struct cmsghdr *cm;
+ int ret;
+ int found_creds = 0;
+
+ /* Must check for space first. */
+ cm = CMSG_FIRSTHDR (message);
+ while (cm)
+ {
+ if (cm->cmsg_type == SCM_CREDS)
+ {
+ if (cm->cmsg_len < CMSG_SPACE (sizeof (struct cmsgcred)))
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+ found_creds = 1;
+ }
+ cm = CMSG_NXTHDR (message, cm);
+ }
+
+
+ ret = __recvmsg (fd, message, flags);
+
+ if (ret == -1)
+ return ret;
+
+ /* Postprocess the message control block for SCM_CREDS. */
+ cm = CMSG_FIRSTHDR (message);
+ if (found_creds)
+ while (cm)
+ {
+ if (cm->cmsg_type == SCM_CREDS)
+ {
+ struct cmsgcred *c = (struct cmsgcred *) CMSG_DATA (cm);
+ struct __kernel_ucred u;
+ int i;
+ memcpy (&u, CMSG_DATA (cm), sizeof (struct __kernel_ucred));
+
+ c->cmcred_pid = u.pid;
+ c->cmcred_uid = u.uid;
+ c->cmcred_gid = u.gid;
+
+ c->cmcred_euid = -1;
+ c->cmcred_ngroups = 0;
+ for (i = 0; i < CMGROUP_MAX; i++)
+ c->cmcred_groups[i] = -1;
+ }
+ cm = CMSG_NXTHDR (message, cm);
+ }
+ return ret;
+}
diff --git a/sysdeps/unix/sysv/linux/sendmsg.c b/sysdeps/unix/sysv/linux/sendmsg.c
new file mode 100644
index 0000000000..8902530c2b
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sendmsg.c
@@ -0,0 +1,91 @@
+/* Copyright (C) 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
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <sys/socket.h>
+#include <errno.h>
+#include <unistd.h>
+
+#include <asm/posix_types.h>
+
+/* The kernel expects this structure in SCM_CREDS messages.
+ * Note: sizeof(struct __kernel_ucred) <= sizeof(struct cmsgcred) must hold.
+ */
+struct __kernel_ucred
+{
+ __kernel_pid_t pid;
+ __kernel_uid_t uid;
+ __kernel_gid_t gid;
+};
+
+extern int __sendmsg (int, const struct msghdr *, int);
+
+/* Send a message described by MESSAGE on socket FD.
+ Returns the number of bytes sent, or -1 for errors. */
+int
+sendmsg (fd, message, flags)
+ int fd;
+ const struct msghdr *message;
+ int flags;
+{
+ struct cmsghdr *cm;
+ struct cmsgcred *cc;
+ struct __kernel_ucred *u;
+ pid_t pid;
+
+ /* Preprocess the message control block for SCM_CREDS. */
+ cm = CMSG_FIRSTHDR (message);
+ while (cm)
+ {
+ if (cm->cmsg_type == SCM_CREDS)
+ {
+ if (cm->cmsg_len < CMSG_SPACE (sizeof (struct cmsgcred)))
+ {
+ __set_errno (EINVAL);
+ return -1;
+ }
+
+ u = (struct __kernel_ucred *) CMSG_DATA (cm);
+ cc = (struct cmsgcred *) CMSG_DATA (cm);
+ /* Linux expects the calling process to pass in
+ its credentials, and sanity checks them.
+ You can send real, effective, or set- uid and gid.
+ If the user hasn't filled in the buffer, we default to
+ real uid and gid. */
+ pid = getpid ();
+ if (cc->cmcred_pid != pid)
+ {
+ u->pid = pid;
+ u->uid = getuid ();
+ u->gid = getgid ();
+ }
+ else
+ {
+ struct __kernel_ucred v;
+ v.pid = cc->cmcred_pid;
+ v.uid = cc->cmcred_uid;
+ v.gid = cc->cmcred_gid;
+ u->pid = v.pid;
+ u->uid = v.uid;
+ u->gid = v.gid;
+ }
+ }
+ cm = CMSG_NXTHDR ((struct msghdr *) message, cm);
+ }
+
+ return __sendmsg (fd, message, flags);
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 20:12:56 +0000