signal.c: move signalfd parsers to a separate file

* signalfd.c: New file.
* Makefile.am (strace_SOURCES): Add it.
* signal.c (do_signalfd, sys_signalfd, sys_signalfd4): Move to signalfd.c

diff --git a/Makefile.am b/Makefile.am
index 5837782e91d41dd25f078401c867203b34988fcc..ff05a2505aacb0ecd29e9d4778b1a6a5d6db3230 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,6 +104,7 @@ strace_SOURCES =    \
        seccomp.c       \
        sigaltstack.c   \
        signal.c        \
+       signalfd.c      \
        sigreturn.c     \
        sock.c          \
        socketutils.c   \

diff --git a/signal.c b/signal.c
index e0f2a70baee34f17e07368846d62fe1f7b89b091..1df3fe5bed43b82e988a955e3e321e688b4898d2 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -685,29 +685,3 @@ SYS_FUNC(restart_syscall)
 
        return RVAL_DECODED;
 }
-
-static int
-do_signalfd(struct tcb *tcp, int flags_arg)
-{
-       /* NB: kernel requires arg[2] == NSIG / 8 */
-       printfd(tcp, tcp->u_arg[0]);
-       tprints(", ");
-       print_sigset_addr_len(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       tprintf(", %lu", tcp->u_arg[2]);
-       if (flags_arg >= 0) {
-               tprints(", ");
-               printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
-       }
-
-       return RVAL_DECODED;
-}
-
-SYS_FUNC(signalfd)
-{
-       return do_signalfd(tcp, -1);
-}
-
-SYS_FUNC(signalfd4)
-{
-       return do_signalfd(tcp, 3);
-}

diff --git a/signalfd.c b/signalfd.c
new file mode 100644 (file)
index 0000000..34f71be
--- /dev/null
+++ b/signalfd.c
@@ -0,0 +1,27 @@
+#include "defs.h"
+
+static int
+do_signalfd(struct tcb *tcp, int flags_arg)
+{
+       /* NB: kernel requires arg[2] == NSIG / 8 */
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       print_sigset_addr_len(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %lu", tcp->u_arg[2]);
+       if (flags_arg >= 0) {
+               tprints(", ");
+               printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+       }
+
+       return RVAL_DECODED;
+}
+
+SYS_FUNC(signalfd)
+{
+       return do_signalfd(tcp, -1);
+}
+
+SYS_FUNC(signalfd4)
+{
+       return do_signalfd(tcp, 3);
+}