From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 16 May 2003 19:56:47 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~19262
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bc58c14e334a40141d84b7951c5875cef96b1a2b;p=external%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 736f112..44e4bb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-05-16  Ulrich Drepper  <drepper@redhat.com>
 
+	* sysdeps/unix/sysv/linux/sigwaitinfo.c (do_sigwaitinfo): Fold
+	SI_TKILL code into SI_USER.
+	* sysdeps/unix/sysv/linux/sigtimedwait.c (do_sigtimedwait): Likewise.
+
 	* sysdeps/posix/sigpause.c (do_sigpause): Use sigdelset after all.
 
 2003-05-15  Jakub Jelinek  <jakub@redhat.com>
diff --git a/sysdeps/unix/sysv/linux/sigtimedwait.c b/sysdeps/unix/sysv/linux/sigtimedwait.c
index 5ace261..a22a1d2 100644
--- a/sysdeps/unix/sysv/linux/sigtimedwait.c
+++ b/sysdeps/unix/sysv/linux/sigtimedwait.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
@@ -28,6 +28,26 @@ extern int __syscall_rt_sigtimedwait (const sigset_t *__unbounded, siginfo_t *__
 				      const struct timespec *__unbounded, size_t);
 
 
+static int
+do_sigtimedwait (const sigset_t *set, siginfo_t *info,
+		 const struct timespec *timeout)
+{
+    /* 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), timeout, _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
 __sigtimedwait (set, info, timeout)
@@ -36,17 +56,13 @@ __sigtimedwait (set, info, timeout)
      const struct timespec *timeout;
 {
   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), timeout, _NSIG / 8);
+    return do_sigtimedwait (set, info, timeout);
 
   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), timeout, _NSIG / 8);
+  int result = do_sigtimedwait (set, info, timeout);
 
   LIBC_CANCEL_RESET (oldtype);
 
diff --git a/sysdeps/unix/sysv/linux/sigwaitinfo.c b/sysdeps/unix/sysv/linux/sigwaitinfo.c
index 102b924..ade5ce9 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);