]> granicus.if.org Git - strace/blobdiff - bjm.c
Fix off_t args on FreeBSD
[strace] / bjm.c
diff --git a/bjm.c b/bjm.c
index 76139b5ef8c8a1c72aef5890d829903a1f898b99..66cbb85486e00706c6961c36d82be3d76e566029 100644 (file)
--- a/bjm.c
+++ b/bjm.c
@@ -1,3 +1,34 @@
+/*
+ * 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.
+ *
+ *     $Id$
+ */
 #include "defs.h"
 
 #if defined(LINUX)
 #include <signal.h>
 #include <linux/module.h>
 
-#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"    },
@@ -42,27 +65,6 @@ static struct xlat modflags[] = {
        { 0,                    NULL                    },
 };
 
-void
-printstringlist(addr,num)
-char* addr;
-int num;
-{
-       int first;
-
-       first=1;
-       tprintf("{");
-       while (num--) {
-               if (first)
-                       first=0;
-               else
-                       tprintf(",");
-               tprintf(addr);
-               addr+=strlen(addr)+1;
-       }
-       tprintf("}");
-}
-
-
 int
 sys_query_module(tcp)
 struct tcb *tcp;
@@ -73,10 +75,12 @@ struct tcb *tcp;
                tprintf(", ");
                printxval(which, tcp->u_arg[1], "QM_???");
                tprintf(", ");
-               if (tcp->u_rval!=0) {
+               if (!verbose(tcp)) {
+                       tprintf("%#lx, %lu, %#lx", tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[4]);
+               } else if (tcp->u_rval!=0) {
                        size_t  ret;
                        umove(tcp, tcp->u_arg[4], &ret);
-                       tprintf("%#lx, %lu, %d", tcp->u_arg[2], tcp->u_arg[3], ret);
+                       tprintf("%#lx, %lu, %Zu", tcp->u_arg[2], tcp->u_arg[3], ret);
                } else if (tcp->u_arg[1]==QM_INFO) {
                        struct module_info      mi;
                        size_t                  ret;
@@ -85,40 +89,58 @@ struct tcb *tcp;
                        printflags(modflags, mi.flags);
                        tprintf(", usecount=%lu}", mi.usecount);
                        umove(tcp, tcp->u_arg[4], &ret);
-                       tprintf(", %d", ret);
+                       tprintf(", %Zu", ret);
                } else if ((tcp->u_arg[1]==QM_MODULES) ||
                                (tcp->u_arg[1]==QM_DEPS) ||
                                (tcp->u_arg[1]==QM_REFS)) {
-                       char*   data    = (char*)malloc(tcp->u_arg[3]);
-                       char*   mod     = data;
                        size_t  ret;
-                       int     first   = 0;
 
-                       umoven(tcp, tcp->u_arg[2], tcp->u_arg[3], data);
                        umove(tcp, tcp->u_arg[4], &ret);
                        tprintf("{");
-                       while (ret--) {
-                               if (first)
-                                       first=0;
-                               else
-                                       tprintf(",");
-                               tprintf(mod);
-                               mod+=strlen(mod)+1;
-                       }
-                       tprintf("}, %d", ret);
-                       free(data);
+                       if (!abbrev(tcp)) {
+                               char*   data    = (char*)malloc(tcp->u_arg[3]);
+                               char*   mod     = data;
+                               size_t  idx;
+
+                               if (data==NULL) {
+                                       fprintf(stderr, "sys_query_module: No memory\n");
+                                       tprintf(" /* %Zu entries */ ", ret);
+                               } else {
+                                       umoven(tcp, tcp->u_arg[2], tcp->u_arg[3], data);
+                                       for (idx=0; idx<ret; idx++) {
+                                               if (idx!=0)
+                                                       tprintf(",");
+                                               tprintf(mod);
+                                               mod+=strlen(mod)+1;
+                                       }
+                                       free(data);
+                               }
+                       } else 
+                               tprintf(" /* %Zu entries */ ", ret);
+                       tprintf("}, %Zu", ret);
                } else if (tcp->u_arg[1]==QM_SYMBOLS) {
-                       char*                   data    = (char *)malloc(tcp->u_arg[3]);
-                       struct module_symbol*   sym     = (struct module_symbol*)data;
-                       size_t                  ret;
-                       umoven(tcp, tcp->u_arg[2], tcp->u_arg[3], data);
+                       size_t  ret;
+                       umove(tcp, tcp->u_arg[4], &ret);
                        tprintf("{");
-                       while (ret--) {
-                               tprintf("{name=%#lx, value=%lu} ", sym->name, sym->value);
-                               sym++;
-                       }
-                       tprintf("}, %d", ret);
-                       free(data);
+                       if (!abbrev(tcp)) {
+                               char*                   data    = (char *)malloc(tcp->u_arg[3]);
+                               struct module_symbol*   sym     = (struct module_symbol*)data;
+                               size_t                  idx;
+
+                               if (data==NULL) {
+                                       fprintf(stderr, "sys_query_module: No memory\n");
+                                       tprintf(" /* %Zu entries */ ", ret);
+                               } else {
+                                       umoven(tcp, tcp->u_arg[2], tcp->u_arg[3], data);
+                                       for (idx=0; idx<ret; idx++) {
+                                               tprintf("{name=%s, value=%lu} ", data+(long)sym->name, sym->value);
+                                               sym++;
+                                       }
+                                       free(data);
+                               }
+                       } else
+                               tprintf(" /* %Zu entries */ ", ret);
+                       tprintf("}, %Zd", ret);
                } else {
                        printstr(tcp, tcp->u_arg[2], tcp->u_arg[3]);
                        tprintf(", %#lx", tcp->u_arg[4]);