tests: move F_OFD_SETLK* checks from fcntl64.c to fcntl-common.c

[strace] / fanotify.c

diff --git a/fanotify.c b/fanotify.c
index 1c3b7f26f65434145323d2b2406a1ea6b11df232..4bed830358fe84d15f020725bd38c430c8a79c6b 100644 (file)
--- a/fanotify.c
+++ b/fanotify.c
@@ -1,3 +1,31 @@
+/*
+ * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-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 "xlat/fan_classes.h"
@@ -12,9 +40,8 @@
 
 SYS_FUNC(fanotify_init)
 {
-       unsigned flags;
+       unsigned int flags = tcp->u_arg[0];
 
-       flags = tcp->u_arg[0];
        printxval(fan_classes, flags & FAN_ALL_CLASS_BITS, "FAN_CLASS_???");
        flags &= ~FAN_ALL_CLASS_BITS;
        if (flags) {
@@ -24,7 +51,7 @@ SYS_FUNC(fanotify_init)
        tprints(", ");
        tprint_open_modes((unsigned) tcp->u_arg[1]);
 
-       return RVAL_DECODED;
+       return RVAL_DECODED | RVAL_FD;
 }
 
 #include "xlat/fan_mark_flags.h"
@@ -32,28 +59,28 @@ SYS_FUNC(fanotify_init)
 
 SYS_FUNC(fanotify_mark)
 {
-       unsigned long long mask = 0;
-       int argn;
-
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
-       printflags(fan_mark_flags, (unsigned) tcp->u_arg[1], "FAN_MARK_???");
+       printflags(fan_mark_flags, tcp->u_arg[1], "FAN_MARK_???");
        tprints(", ");
        /*
         * the mask argument is defined as 64-bit,
         * but kernel uses the lower 32 bits only.
         */
-       argn = getllval(tcp, &mask, 2);
+       unsigned long long mask = 0;
+       int argn = getllval(tcp, &mask, 2);
 #ifdef HPPA
        /* Parsic is weird.  See arch/parisc/kernel/sys_parisc32.c.  */
        mask = (mask << 32) | (mask >> 32);
 #endif
-       printflags(fan_event_flags, mask, "FAN_???");
+       printflags64(fan_event_flags, mask, "FAN_???");
        tprints(", ");
-       if ((int) tcp->u_arg[argn] == FAN_NOFD)
-               tprints("FAN_NOFD, ");
-       else
+       if ((int) tcp->u_arg[argn] == FAN_NOFD) {
+               print_xlat_d(FAN_NOFD);
+               tprints(", ");
+       } else {
                print_dirfd(tcp, tcp->u_arg[argn]);
+       }
        printpath(tcp, tcp->u_arg[argn + 1]);
 
        return RVAL_DECODED;