[git commit future] sigqueue.c: rewrite a bit
Peter S. Mazinger
ps.m at gmx.net
Wed Apr 27 07:29:44 UTC 2011
commit: http://git.uclibc.org/uClibc/commit/?id=caba0b9c622d5afa44c509cd361532b1fa1a83a2
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future
Use sizeof(info) instead of sizeof(siginfo_t).
stubs.c: add sigqueue stub.
Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
libc/sysdeps/linux/common/sigqueue.c | 39 ++++++++++++++-------------------
libc/sysdeps/linux/common/stubs.c | 4 +++
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/libc/sysdeps/linux/common/sigqueue.c b/libc/sysdeps/linux/common/sigqueue.c
index c407539..8c8b0db 100644
--- a/libc/sysdeps/linux/common/sigqueue.c
+++ b/libc/sysdeps/linux/common/sigqueue.c
@@ -16,16 +16,12 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <errno.h>
-#include <signal.h>
-#include <unistd.h>
-#include <string.h>
-
#include <sys/syscall.h>
-#if defined __USE_POSIX199309
-
-#ifdef __NR_rt_sigqueueinfo
+#if defined __NR_rt_sigqueueinfo && defined __USE_POSIX199309
+# include <signal.h>
+# include <unistd.h>
+# include <string.h>
# define __NR___syscall_rt_sigqueueinfo __NR_rt_sigqueueinfo
static __always_inline _syscall3(int, __syscall_rt_sigqueueinfo, pid_t, pid, int, sig, void*, value)
@@ -33,20 +29,19 @@ static __always_inline _syscall3(int, __syscall_rt_sigqueueinfo, pid_t, pid, int
/* Return any pending signal or wait for one for the given time. */
int sigqueue (pid_t pid, int sig, const union sigval val)
{
- siginfo_t info;
-
- /* First, clear the siginfo_t structure, so that we don't pass our
- stack content to other tasks. */
- memset (&info, 0, sizeof (siginfo_t));
- /* We must pass the information about the data in a siginfo_t value. */
- info.si_signo = sig;
- info.si_code = SI_QUEUE;
- info.si_pid = getpid ();
- info.si_uid = getuid ();
- info.si_value = val;
-
- return __syscall_rt_sigqueueinfo(pid, sig, &info);
+ siginfo_t info;
+
+ /* First, clear the siginfo_t structure, so that we don't pass our
+ stack content to other tasks. */
+ memset(&info, 0, sizeof(info));
+ /* We must pass the information about the data in a siginfo_t value. */
+ info.si_signo = sig;
+ info.si_code = SI_QUEUE;
+ info.si_pid = getpid ();
+ info.si_uid = getuid ();
+ info.si_value = val;
+
+ return __syscall_rt_sigqueueinfo(pid, sig, &info);
}
#endif
-#endif
diff --git a/libc/sysdeps/linux/common/stubs.c b/libc/sysdeps/linux/common/stubs.c
index eed1875..7da2278 100644
--- a/libc/sysdeps/linux/common/stubs.c
+++ b/libc/sysdeps/linux/common/stubs.c
@@ -183,6 +183,10 @@ make_stub(sigtimedwait)
make_stub(sigwaitinfo)
#endif
+#ifndef __NR_rt_sigqueueinfo
+make_stub(sigqueue)
+#endif
+
#ifndef __NR_readahead
make_stub(readahead)
#endif
--
1.7.3.4
More information about the uClibc-cvs
mailing list