X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=fanotify.c;h=91edf068222cab2fe3f0256c63f1c0de47913709;hb=92ee9f0b83ce8c0d7801a12a37c3d5b635935fba;hp=4bed830358fe84d15f020725bd38c430c8a79c6b;hpb=966da001af73439a0e9258e478aae0adcdb138d7;p=strace diff --git a/fanotify.c b/fanotify.c index 4bed8303..91edf068 100644 --- a/fanotify.c +++ b/fanotify.c @@ -1,29 +1,9 @@ /* * Copyright (c) 2014-2015 Dmitry V. Levin - * Copyright (c) 2014-2017 The strace developers. + * Copyright (c) 2014-2019 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. + * SPDX-License-Identifier: LGPL-2.1-or-later */ #include "defs.h" @@ -75,12 +55,11 @@ SYS_FUNC(fanotify_mark) #endif printflags64(fan_event_flags, mask, "FAN_???"); tprints(", "); - if ((int) tcp->u_arg[argn] == FAN_NOFD) { + if ((int) tcp->u_arg[argn] == FAN_NOFD) print_xlat_d(FAN_NOFD); - tprints(", "); - } else { + else print_dirfd(tcp, tcp->u_arg[argn]); - } + tprints(", "); printpath(tcp, tcp->u_arg[argn + 1]); return RVAL_DECODED;