From: Roland McGrath <roland@redhat.com>
Date: Fri, 18 Jul 2008 01:02:41 +0000 (+0000)
Subject: 2008-07-17  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fef51d9480db70025808d17044bf64f3ce7b2df;p=strace

2008-07-17  Roland McGrath  <roland@redhat.com>

	* signal.c (sigact_flags): Prefer SA_NODEFER to SA_NOMASK,
	SA_RESETHAND to SA_ONESHOT.
	Fixes RH#455821.
---

diff --git a/signal.c b/signal.c
index 06773321..9caba795 100644
--- a/signal.c
+++ b/signal.c
@@ -215,10 +215,16 @@ static const struct xlat sigact_flags[] = {
 #ifdef SA_INTERRUPT
 	{ SA_INTERRUPT,	"SA_INTERRUPT"	},
 #endif
-#ifdef SA_NOMASK
+#ifdef SA_NODEFER
+	{ SA_NODEFER,	"SA_NODEFER"	},
+#endif
+#if defined SA_NOMASK && SA_NODEFER != SA_NOMASK
 	{ SA_NOMASK,	"SA_NOMASK"	},
 #endif
-#ifdef SA_ONESHOT
+#ifdef SA_RESETHAND
+	{ SA_RESETHAND,	"SA_RESETHAND"	},
+#endif
+#if defined SA_ONESHOT && SA_ONESHOT != SA_RESETHAND
 	{ SA_ONESHOT,	"SA_ONESHOT"	},
 #endif
 #ifdef SA_SIGINFO