travis: add build environment information to the travis log

[strace] / loop.c

diff --git a/loop.c b/loop.c
index ebb518bcabdd8e1a7a1bafc7e7ba3c05450e3b26..e30b7ce59b4a6a36b867f56f41dacd62a8d4d3f3 100644 (file)
--- a/loop.c
+++ b/loop.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012 The Chromium OS Authors.
+ * Copyright (c) 2012-2017 The strace developers.
  * Written by Mike Frysinger <vapier@gentoo.org>.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,6 +36,8 @@ typedef struct loop_info struct_loop_info;
 
 #include MPERS_DEFS
 
+#include "print_fields.h"
+#include "xlat/loop_cmds.h"
 #include "xlat/loop_flags_options.h"
 #include "xlat/loop_crypt_type_options.h"
 
@@ -50,11 +53,9 @@ decode_loop_info(struct tcb *const tcp, const kernel_ulong_t addr)
        tprintf("{lo_number=%d", info.lo_number);
 
        if (!abbrev(tcp)) {
-               tprints(", lo_device=");
-               print_dev_t(info.lo_device);
+               PRINT_FIELD_DEV(", ", info, lo_device);
                tprintf(", lo_inode=%" PRI_klu, (kernel_ulong_t) info.lo_inode);
-               tprints(", lo_rdevice=");
-               print_dev_t(info.lo_rdevice);
+               PRINT_FIELD_DEV(", ", info, lo_rdevice);
        }
 
        tprintf(", lo_offset=%#x", info.lo_offset);
@@ -63,25 +64,29 @@ decode_loop_info(struct tcb *const tcp, const kernel_ulong_t addr)
                tprints(", lo_encrypt_type=");
                printxval(loop_crypt_type_options, info.lo_encrypt_type,
                        "LO_CRYPT_???");
-               tprintf(", lo_encrypt_key_size=%d", info.lo_encrypt_key_size);
+               /*
+                * It is converted to unsigned before use in kernel, see
+                * loop_info64_from_old in drivers/block/loop.c
+                */
+               tprintf(", lo_encrypt_key_size=%" PRIu32,
+                       (uint32_t) info.lo_encrypt_key_size);
        }
 
        tprints(", lo_flags=");
        printflags(loop_flags_options, info.lo_flags, "LO_FLAGS_???");
 
-       tprints(", lo_name=");
-       print_quoted_string(info.lo_name, LO_NAME_SIZE,
-                           QUOTE_0_TERMINATED);
+       PRINT_FIELD_CSTRING(", ", info, lo_name);
 
        if (!abbrev(tcp) || info.lo_encrypt_type != LO_CRYPT_NONE) {
-               tprints(", lo_encrypt_key=");
-               print_quoted_string((void *) info.lo_encrypt_key,
-                                   LO_KEY_SIZE, 0);
+               const unsigned int lo_encrypt_key_size =
+                       MIN((unsigned) info.lo_encrypt_key_size, LO_KEY_SIZE);
+               PRINT_FIELD_STRING(", ", info, lo_encrypt_key,
+                                         lo_encrypt_key_size, 0);
        }
 
        if (!abbrev(tcp))
                tprintf(", lo_init=[%#" PRI_klx ", %#" PRI_klx "]"
-                       ", reserved=[%#x, %#x, %#x, %#x]}",
+                       ", reserved=[%#hhx, %#hhx, %#hhx, %#hhx]}",
                        (kernel_ulong_t) info.lo_init[0],
                        (kernel_ulong_t) info.lo_init[1],
                        info.reserved[0], info.reserved[1],
@@ -100,11 +105,9 @@ decode_loop_info64(struct tcb *const tcp, const kernel_ulong_t addr)
                return;
 
        if (!abbrev(tcp)) {
-               tprints("{lo_device=");
-               print_dev_t(info64.lo_device);
+               PRINT_FIELD_DEV("{", info64, lo_device);
                tprintf(", lo_inode=%" PRIu64, (uint64_t) info64.lo_inode);
-               tprints(", lo_rdevice=");
-               print_dev_t(info64.lo_rdevice);
+               PRINT_FIELD_DEV(", ", info64, lo_rdevice);
                tprintf(", lo_offset=%#" PRIx64 ", lo_sizelimit=%" PRIu64
                        ", lo_number=%" PRIu32,
                        (uint64_t) info64.lo_offset,
@@ -127,17 +130,14 @@ decode_loop_info64(struct tcb *const tcp, const kernel_ulong_t addr)
        tprints(", lo_flags=");
        printflags(loop_flags_options, info64.lo_flags, "LO_FLAGS_???");
 
-       tprints(", lo_file_name=");
-       print_quoted_string((void *) info64.lo_file_name,
-                           LO_NAME_SIZE, QUOTE_0_TERMINATED);
+       PRINT_FIELD_CSTRING(", ", info64, lo_file_name);
 
        if (!abbrev(tcp) || info64.lo_encrypt_type != LO_CRYPT_NONE) {
-               tprints(", lo_crypt_name=");
-               print_quoted_string((void *) info64.lo_crypt_name,
-                                   LO_NAME_SIZE, QUOTE_0_TERMINATED);
-               tprints(", lo_encrypt_key=");
-               print_quoted_string((void *) info64.lo_encrypt_key,
-                                   LO_KEY_SIZE, 0);
+               PRINT_FIELD_CSTRING(", ", info64, lo_crypt_name);
+               const unsigned int lo_encrypt_key_size =
+                       MIN((unsigned) info64.lo_encrypt_key_size, LO_KEY_SIZE);
+               PRINT_FIELD_STRING(", ", info64, lo_encrypt_key,
+                                         lo_encrypt_key_size, 0);
        }
 
        if (!abbrev(tcp))
@@ -152,9 +152,6 @@ MPERS_PRINTER_DECL(int, loop_ioctl,
                   struct tcb *tcp, const unsigned int code,
                   const kernel_ulong_t arg)
 {
-       if (!verbose(tcp))
-               return RVAL_DECODED;
-
        switch (code) {
        case LOOP_GET_STATUS:
                if (entering(tcp))
@@ -173,13 +170,9 @@ MPERS_PRINTER_DECL(int, loop_ioctl,
                break;
 
        case LOOP_CLR_FD:
-#ifdef LOOP_SET_CAPACITY
        case LOOP_SET_CAPACITY:
-#endif
-#ifdef LOOP_CTL_GET_FREE
        /* newer loop-control stuff */
        case LOOP_CTL_GET_FREE:
-#endif
                /* Takes no arguments */
                break;
 
@@ -189,19 +182,15 @@ MPERS_PRINTER_DECL(int, loop_ioctl,
                printfd(tcp, arg);
                break;
 
-#ifdef LOOP_CTL_ADD
        /* newer loop-control stuff */
        case LOOP_CTL_ADD:
        case LOOP_CTL_REMOVE:
                tprintf(", %d", (int) arg);
                break;
-#endif
 
-#ifdef LOOP_SET_DIRECT_IO
        case LOOP_SET_DIRECT_IO:
                tprintf(", %" PRI_klu, arg);
                break;
-#endif
 
        default:
                return RVAL_DECODED;