Update.

	* sysdeps/unix/sysv/linux/sigwaitinfo.c (do_sigwaitinfo): Fold
	SI_TKILL code into SI_USER.
	* sysdeps/unix/sysv/linux/sigtimedwait.c (do_sigtimedwait): Likewise.

1 files changed, 22 insertions, 7 deletions

diff --git a/sysdeps/unix/sysv/linux/sigwaitinfo.c b/sysdeps/unix/sysv/linux/sigwaitinfo.c
index 102b924904..ade5ce9175 100644
--- a/sysdeps/unix/sysv/linux/sigwaitinfo.c
+++ b/sysdeps/unix/sysv/linux/sigwaitinfo.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998, 2000, 2002, 2003 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
@@ -30,6 +30,25 @@ extern int __syscall_rt_sigtimedwait (const sigset_t *__unbounded, siginfo_t *__
 				      const struct timespec *__unbounded, size_t);
 
 
+static int
+do_sigwaitinfo (const sigset_t *set, siginfo_t *info)
+{
+  /* XXX The size argument hopefully will have to be changed to the
+     real size of the user-level sigset_t.  */
+  int result = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),
+			       CHECK_1 (info), NULL, _NSIG / 8);
+
+  /* The kernel generates a SI_TKILL code in si_code in case tkill is
+     used.  tkill is transparently used in raise().  Since having
+     SI_TKILL as a code is useful in general we fold the results
+     here.  */
+  if (result != -1 && info != NULL && info->si_code == SI_TKILL)
+    info->si_code = SI_USER;
+
+  return result;
+}
+
+
 /* Return any pending signal or wait for one for the given time.  */
 int
 __sigwaitinfo (set, info)
@@ -37,17 +56,13 @@ __sigwaitinfo (set, info)
      siginfo_t *info;
 {
   if (SINGLE_THREAD_P)
-    /* XXX The size argument hopefully will have to be changed to the
-       real size of the user-level sigset_t.  */
-    return INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),
-			   CHECK_1 (info), NULL, _NSIG / 8);
+    return do_sigwaitinfo (set, info);
 
   int oldtype = LIBC_CANCEL_ASYNC ();
 
   /* XXX The size argument hopefully will have to be changed to the
      real size of the user-level sigset_t.  */
-  int result = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set),
-			       CHECK_1 (info), NULL, _NSIG / 8);
+  int result = do_sigwaitinfo (set, info);
 
   LIBC_CANCEL_RESET (oldtype);