Remove linux/ptp_clock.h

[strace] / signalfd.c

diff --git a/signalfd.c b/signalfd.c
index 34f71beb1e490698a746fddf8196ec6e1e3d7acc..baf0dab5d54cfd08473626941bf8636a4c4c7177 100644 (file)
--- a/signalfd.c
+++ b/signalfd.c
@@ -1,19 +1,53 @@
+/*
+ * Copyright (c) 2008-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 The strace developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 #include "defs.h"
+#include <fcntl.h>
+#ifdef HAVE_SYS_SIGNALFD_H
+# include <sys/signalfd.h>
+#endif
+
+#include "xlat/sfd_flags.h"
 
 static int
 do_signalfd(struct tcb *tcp, int flags_arg)
 {
-       /* NB: kernel requires arg[2] == NSIG / 8 */
+       /* NB: kernel requires arg[2] == NSIG_BYTES */
        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]);
+       tprintf(", %" PRI_klu, tcp->u_arg[2]);
        if (flags_arg >= 0) {
                tprints(", ");
-               printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+               printflags(sfd_flags, tcp->u_arg[flags_arg], "SFD_???");
        }
 
-       return RVAL_DECODED;
+       return RVAL_DECODED | RVAL_FD;
 }
 
 SYS_FUNC(signalfd)