]> granicus.if.org Git - strace/blobdiff - bjm.c
Remove recently introduced use of ULONG_MAX
[strace] / bjm.c
diff --git a/bjm.c b/bjm.c
index 0c0cf66fba7daf398704d08c41807c801083d367..6ae37587187ea8db7c58459d61a22d9897286d39 100644 (file)
--- a/bjm.c
+++ b/bjm.c
  * 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 "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>
 
-static struct xlat which[] = {
+/* Bits of module.flags.  */
+
+#define MOD_UNINITIALIZED      0
+#define MOD_RUNNING            1
+#define MOD_DELETED            2
+#define MOD_AUTOCLEAN          4
+#define MOD_VISITED            8
+#define MOD_USED_ONCE          16
+#define MOD_JUST_FREED         32
+#define MOD_INITIALIZING       64
+
+/* Values for query_module's which.  */
+
+#define QM_MODULES     1
+#define QM_DEPS                2
+#define QM_REFS                3
+#define QM_SYMBOLS     4
+#define QM_INFO                5
+
+struct module_symbol
+{
+       unsigned long value;
+       const char *name;
+};
+
+struct module_info
+{
+       unsigned long addr;
+       unsigned long size;
+       unsigned long flags;
+       long usecount;
+};
+
+static const struct xlat which[] = {
        { 0,            "0"             },
        { QM_MODULES,   "QM_MODULES"    },
        { QM_DEPS,      "QM_DEPS"       },
@@ -54,7 +79,7 @@ static struct xlat which[] = {
        { 0,            NULL            },
 };
 
-static struct xlat modflags[] = {
+static const struct xlat modflags[] = {
        { MOD_UNINITIALIZED,    "MOD_UNINITIALIZED"     },
        { MOD_RUNNING,          "MOD_RUNNING"           },
        { MOD_DELETED,          "MOD_DELETED"           },
@@ -66,68 +91,85 @@ static struct xlat modflags[] = {
 };
 
 int
-sys_query_module(tcp)
-struct tcb *tcp;
+sys_query_module(struct tcb *tcp)
 {
-
-       if (exiting(tcp)) {
+       if (entering(tcp)) {
                printstr(tcp, tcp->u_arg[0], -1);
-               tprintf(", ");
+               tprints(", ");
                printxval(which, tcp->u_arg[1], "QM_???");
-               tprintf(", ");
-               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, %Zu", tcp->u_arg[2], tcp->u_arg[3], ret);
+               tprints(", ");
+       } else {
+               size_t ret;
+
+               if (!verbose(tcp) || syserror(tcp) ||
+                   umove(tcp, tcp->u_arg[4], &ret) < 0) {
+                       tprintf("%#lx, %lu, %#lx", tcp->u_arg[2],
+                               tcp->u_arg[3], tcp->u_arg[4]);
                } else if (tcp->u_arg[1]==QM_INFO) {
                        struct module_info      mi;
-                       size_t                  ret;
-                       umove(tcp, tcp->u_arg[2], &mi);
-                       tprintf("{address=%#lx, size=%lu, flags=", mi.addr, mi.size);
-                       printflags(modflags, mi.flags);
-                       tprintf(", usecount=%lu}", mi.usecount);
-                       umove(tcp, tcp->u_arg[4], &ret);
-                       tprintf(", %Zu", ret);
+                       if (umove(tcp, tcp->u_arg[2], &mi) < 0) {
+                               tprintf("%#lx, ", tcp->u_arg[2]);
+                       } else {
+                               tprintf("{address=%#lx, size=%lu, flags=",
+                                       mi.addr, mi.size);
+                               printflags(modflags, mi.flags, "MOD_???");
+                               tprintf(", usecount=%lu}, ", mi.usecount);
+                       }
+                       tprintf("%Zu", ret);
                } else if ((tcp->u_arg[1]==QM_MODULES) ||
-                               (tcp->u_arg[1]==QM_DEPS) ||
-                               (tcp->u_arg[1]==QM_REFS)) {
-                       size_t  ret;
-
-                       umove(tcp, tcp->u_arg[4], &ret);
-                       tprintf("{");
+                          (tcp->u_arg[1]==QM_DEPS) ||
+                          (tcp->u_arg[1]==QM_REFS)) {
+                       tprints("{");
                        if (!abbrev(tcp)) {
-                               char*   data    = (char*)malloc(tcp->u_arg[3]);
+                               char*   data    = malloc(tcp->u_arg[3]);
                                char*   mod     = data;
                                size_t  idx;
 
-                               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;
+                               if (!data) {
+                                       fprintf(stderr, "out of memory\n");
+                                       tprintf(" /* %Zu entries */ ", ret);
+                               } else {
+                                       if (umoven(tcp, tcp->u_arg[2],
+                                               tcp->u_arg[3], data) < 0) {
+                                               tprintf(" /* %Zu entries */ ", ret);
+                                       } else {
+                                               for (idx = 0; idx < ret; idx++) {
+                                                       tprintf("%s%s",
+                                                               (idx ? ", " : ""),
+                                                               mod);
+                                                       mod += strlen(mod)+1;
+                                               }
+                                       }
+                                       free(data);
                                }
-                               free(data);
-                       } else 
+                       } else
                                tprintf(" /* %Zu entries */ ", ret);
                        tprintf("}, %Zu", ret);
                } else if (tcp->u_arg[1]==QM_SYMBOLS) {
-                       size_t  ret;
-                       umove(tcp, tcp->u_arg[4], &ret);
-                       tprintf("{");
+                       tprints("{");
                        if (!abbrev(tcp)) {
-                               char*                   data    = (char *)malloc(tcp->u_arg[3]);
+                               char*                   data    = malloc(tcp->u_arg[3]);
                                struct module_symbol*   sym     = (struct module_symbol*)data;
                                size_t                  idx;
 
-                               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++;
+                               if (!data) {
+                                       fprintf(stderr, "out of memory\n");
+                                       tprintf(" /* %Zu entries */ ", ret);
+                               } else {
+                                       if (umoven(tcp, tcp->u_arg[2],
+                                               tcp->u_arg[3], data) < 0) {
+                                               tprintf(" /* %Zu entries */ ", ret);
+                                       } else {
+                                               for (idx = 0; idx < ret; idx++) {
+                                                       tprintf("%s{name=%s, value=%lu}",
+                                                               (idx ? " " : ""),
+                                                               data+(long)sym->name,
+                                                               sym->value);
+                                                       sym++;
+                                               }
+                                       }
+                                       free(data);
                                }
-                               free(data);
                        } else
                                tprintf(" /* %Zu entries */ ", ret);
                        tprintf("}, %Zd", ret);
@@ -140,8 +182,7 @@ struct tcb *tcp;
 }
 
 int
-sys_create_module(tcp)
-struct tcb *tcp;
+sys_create_module(struct tcb *tcp)
 {
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
@@ -151,14 +192,12 @@ struct tcb *tcp;
 }
 
 int
-sys_init_module(tcp)
-struct tcb *tcp;
+sys_init_module(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprintf(", %#lx", tcp->u_arg[1]);
+               tprintf("%#lx, ", tcp->u_arg[0]);
+               tprintf("%lu, ", tcp->u_arg[1]);
+               printstr(tcp, tcp->u_arg[2], -1);
        }
        return 0;
 }
-#endif /* LINUX */
-