Update NEWS

[strace] / inotify.c

diff --git a/inotify.c b/inotify.c
index 81c8c5d832b3e59bb90265f9d34bec85e6a2dc23..5ada8a863307ac17ef8af250b61e81c81b9c7921 100644 (file)
--- a/inotify.c
+++ b/inotify.c
@@ -1,41 +1,64 @@
+/*
+ * Copyright (c) 2006 Bernhard Kaindl <bk@suse.de>
+ * Copyright (c) 2006-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * 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>
 
 #include "xlat/inotify_flags.h"
 #include "xlat/inotify_init_flags.h"
 
-int
-sys_inotify_add_watch(struct tcb *tcp)
+SYS_FUNC(inotify_add_watch)
 {
-       if (entering(tcp)) {
-               /* file descriptor */
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               /* pathname */
-               printpath(tcp, tcp->u_arg[1]);
-               tprints(", ");
-               /* mask */
-               printflags(inotify_flags, tcp->u_arg[2], "IN_???");
-       }
-       return 0;
+       /* file descriptor */
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       /* pathname */
+       printpath(tcp, tcp->u_arg[1]);
+       tprints(", ");
+       /* mask */
+       printflags(inotify_flags, tcp->u_arg[2], "IN_???");
+
+       return RVAL_DECODED;
 }
 
-int
-sys_inotify_rm_watch(struct tcb *tcp)
+SYS_FUNC(inotify_rm_watch)
 {
-       if (entering(tcp)) {
-               /* file descriptor */
-               printfd(tcp, tcp->u_arg[0]);
-               /* watch descriptor */
-               tprintf(", %d", (int) tcp->u_arg[1]);
-       }
-       return 0;
+       /* file descriptor */
+       printfd(tcp, tcp->u_arg[0]);
+       /* watch descriptor */
+       tprintf(", %d", (int) tcp->u_arg[1]);
+
+       return RVAL_DECODED;
 }
 
-int
-sys_inotify_init1(struct tcb *tcp)
+SYS_FUNC(inotify_init1)
 {
-       if (entering(tcp))
-               printflags(inotify_init_flags, tcp->u_arg[0], "IN_???");
-       return 0;
+       printflags(inotify_init_flags, tcp->u_arg[0], "IN_???");
+
+       return RVAL_DECODED | RVAL_FD;
 }