Robustify mpers.awk against invalid input

[strace] / inotify.c

diff --git a/inotify.c b/inotify.c
index 81c8c5d832b3e59bb90265f9d34bec85e6a2dc23..98d24f286030f223b0853e790f5b2d2e628711cd 100644 (file)
--- a/inotify.c
+++ b/inotify.c
@@ -4,38 +4,33 @@
 #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;
 }