tests: rewrite sigreturn syscall decoding check from match_grep to match_diff

[strace] / bjm.c

diff --git a/bjm.c b/bjm.c
index 2bb91a970f9d542870acdec583b9dcd352d41c8f..926add3c4c2ed047022820a4c62bde956d0ba0a1 100644 (file)
--- a/bjm.c
+++ b/bjm.c
@@ -1,61 +1,68 @@
-#include "defs.h"
+/*
+ * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * 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 <sys/stat.h>
-#include <sys/time.h>
-#include <sys/wait.h>
-#include <sys/resource.h>
-#include <sys/utsname.h>
-#include <sys/user.h>
-#include <sys/syscall.h>
-#include <signal.h>
-#include <linux/module.h>
-
-/* WTA: #define these here: since Debian uses glibc2's includefiles
- * instead of the kernel includes we miss these otherwise.
- */
 
-#if !defined(QM_MODULES)
-#define QM_MODULES     1
-#define QM_DEPS                2
-#define QM_REFS                3
-#define QM_SYMBOLS     4
-#define QM_INFO                5
-#endif
-
-static struct xlat which[] = {
-       { 0,                    "0"                             },
-       { QM_MODULES,   "QM_MODULES"    },
-       { QM_DEPS,              "QM_DEPS"               },
-       { QM_REFS,              "QM_REFS"               },
-       { QM_SYMBOLS,   "QM_SYMBOLS"    },
-       { QM_INFO,              "QM_INFO"               },
-       { 0,                    NULL                    },
-};
-
-int
-sys_query_module(tcp)
-struct tcb *tcp;
+#include "xlat/delete_module_flags.h"
+
+SYS_FUNC(delete_module)
 {
+       printstr(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printflags(delete_module_flags, tcp->u_arg[1], "O_???");
 
-       if (entering(tcp)) {
-               printstr(tcp, tcp->u_arg[0], -1);
-               tprintf(", ");
-               printxval(which, tcp->u_arg[1], "L_???");
-               tprintf(", ");
-               printstr(tcp, tcp->u_arg[2], tcp->u_arg[3]);
-               tprintf(", %#lx", tcp->u_arg[4]);
-       }
-       return 0;
+       return RVAL_DECODED;
 }
 
-int
-sys_delete_module(tcp)
-struct tcb *tcp;
+SYS_FUNC(init_module)
+{
+       printaddr(tcp->u_arg[0]);
+       tprintf(", %" PRI_klu ", ", tcp->u_arg[1]);
+       printstr(tcp, tcp->u_arg[2]);
+
+       return RVAL_DECODED;
+}
+
+#include "xlat/module_init_flags.h"
+
+SYS_FUNC(finit_module)
 {
+       /* file descriptor */
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       /* param_values */
+       printstr(tcp, tcp->u_arg[1]);
+       tprints(", ");
+       /* flags */
+       printflags(module_init_flags, tcp->u_arg[2], "MODULE_INIT_???");
 
-       if (entering(tcp)) {
-               printstr(tcp, tcp->u_arg[0], -1);
-       }
-       return 0;
+       return RVAL_DECODED;
 }