]> granicus.if.org Git - strace/blobdiff - util.c
nlattr: add UID/GID netlink attribute decoders
[strace] / util.c
diff --git a/util.c b/util.c
index e33b0a95f29a612654f8e771bbc24b4f40956eeb..035f57bfa8d766a11a1479712051b9d3d0435d59 100644 (file)
--- a/util.c
+++ b/util.c
@@ -6,7 +6,7 @@
  * Copyright (c) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
  *                     Linux for s390 port by D.J. Barrow
  *                    <barrow_dj@mail.yahoo.com,djbarrow@de.ibm.com>
- * Copyright (c) 1999-2017 The strace developers.
+ * Copyright (c) 1999-2018 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  */
 
 #include "defs.h"
-#include <sys/param.h>
+#include <limits.h>
 #include <fcntl.h>
 #include <stdarg.h>
+#include <sys/stat.h>
+#include <sys/sysmacros.h>
 #ifdef HAVE_SYS_XATTR_H
 # include <sys/xattr.h>
 #endif
 #include <sys/uio.h>
-#include <asm/unistd.h>
 
-#include "scno.h"
-#include "regs.h"
-#include "ptrace.h"
+#include "largefile_wrappers.h"
+#include "xlat.h"
+#include "xstring.h"
 
 int
-string_to_uint_ex(const char *const str, char **const endptr,
-                 const unsigned int max_val, const char *const accepted_ending)
+ts_nz(const struct timespec *a)
 {
-       char *end;
-       long val;
-
-       if (!*str)
-               return -1;
-
-       errno = 0;
-       val = strtol(str, &end, 10);
-
-       if (str == end || val < 0 || (unsigned long) val > max_val
-           || (val == LONG_MAX && errno == ERANGE))
-               return -1;
-
-       if (*end && (!accepted_ending || !strchr(accepted_ending, *end)))
-               return -1;
-
-       if (endptr)
-               *endptr = end;
-
-       return (int) val;
+       return a->tv_sec || a->tv_nsec;
 }
 
 int
-string_to_uint(const char *const str)
-{
-       return string_to_uint_upto(str, INT_MAX);
-}
-
-int
-tv_nz(const struct timeval *a)
-{
-       return a->tv_sec || a->tv_usec;
-}
-
-int
-tv_cmp(const struct timeval *a, const struct timeval *b)
+ts_cmp(const struct timespec *a, const struct timespec *b)
 {
        if (a->tv_sec < b->tv_sec
-           || (a->tv_sec == b->tv_sec && a->tv_usec < b->tv_usec))
+           || (a->tv_sec == b->tv_sec && a->tv_nsec < b->tv_nsec))
                return -1;
        if (a->tv_sec > b->tv_sec
-           || (a->tv_sec == b->tv_sec && a->tv_usec > b->tv_usec))
+           || (a->tv_sec == b->tv_sec && a->tv_nsec > b->tv_nsec))
                return 1;
        return 0;
 }
 
 double
-tv_float(const struct timeval *tv)
+ts_float(const struct timespec *tv)
 {
-       return tv->tv_sec + tv->tv_usec/1000000.0;
+       return tv->tv_sec + tv->tv_nsec/1000000000.0;
 }
 
 void
-tv_add(struct timeval *tv, const struct timeval *a, const struct timeval *b)
+ts_add(struct timespec *tv, const struct timespec *a, const struct timespec *b)
 {
        tv->tv_sec = a->tv_sec + b->tv_sec;
-       tv->tv_usec = a->tv_usec + b->tv_usec;
-       if (tv->tv_usec >= 1000000) {
+       tv->tv_nsec = a->tv_nsec + b->tv_nsec;
+       if (tv->tv_nsec >= 1000000000) {
                tv->tv_sec++;
-               tv->tv_usec -= 1000000;
+               tv->tv_nsec -= 1000000000;
        }
 }
 
 void
-tv_sub(struct timeval *tv, const struct timeval *a, const struct timeval *b)
+ts_sub(struct timespec *tv, const struct timespec *a, const struct timespec *b)
 {
        tv->tv_sec = a->tv_sec - b->tv_sec;
-       tv->tv_usec = a->tv_usec - b->tv_usec;
-       if (((long) tv->tv_usec) < 0) {
+       tv->tv_nsec = a->tv_nsec - b->tv_nsec;
+       if (tv->tv_nsec < 0) {
                tv->tv_sec--;
-               tv->tv_usec += 1000000;
+               tv->tv_nsec += 1000000000;
        }
 }
 
 void
-tv_div(struct timeval *tv, const struct timeval *a, int n)
+ts_div(struct timespec *tv, const struct timespec *a, int n)
 {
-       tv->tv_usec = (a->tv_sec % n * 1000000 + a->tv_usec + n / 2) / n;
-       tv->tv_sec = a->tv_sec / n + tv->tv_usec / 1000000;
-       tv->tv_usec %= 1000000;
+       long long nsec = (a->tv_sec % n * 1000000000LL + a->tv_nsec + n / 2) / n;
+       tv->tv_sec = a->tv_sec / n + nsec / 1000000000;
+       tv->tv_nsec = nsec % 1000000000;
 }
 
 void
-tv_mul(struct timeval *tv, const struct timeval *a, int n)
+ts_mul(struct timespec *tv, const struct timespec *a, int n)
 {
-       tv->tv_usec = a->tv_usec * n;
-       tv->tv_sec = a->tv_sec * n + tv->tv_usec / 1000000;
-       tv->tv_usec %= 1000000;
-}
-
-const char *
-xlookup(const struct xlat *xlat, const uint64_t val)
-{
-       for (; xlat->str != NULL; xlat++)
-               if (xlat->val == val)
-                       return xlat->str;
-       return NULL;
-}
-
-static int
-xlat_bsearch_compare(const void *a, const void *b)
-{
-       const uint64_t val1 = *(const uint64_t *) a;
-       const uint64_t val2 = ((const struct xlat *) b)->val;
-       return (val1 > val2) ? 1 : (val1 < val2) ? -1 : 0;
-}
-
-const char *
-xlat_search(const struct xlat *xlat, const size_t nmemb, const uint64_t val)
-{
-       const struct xlat *e =
-               bsearch((const void*) &val,
-                       xlat, nmemb, sizeof(*xlat), xlat_bsearch_compare);
-
-       return e ? e->str : NULL;
+       long long nsec = a->tv_nsec * n;
+       tv->tv_sec = a->tv_sec * n + nsec / 1000000000;
+       tv->tv_nsec = nsec % 1000000000;
 }
 
 #if !defined HAVE_STPCPY
@@ -191,7 +133,7 @@ int
 next_set_bit(const void *bit_array, unsigned cur_bit, unsigned size_bits)
 {
        const unsigned endian = 1;
-       int little_endian = * (char *) (void *) &endian;
+       int little_endian = *(char *) (void *) &endian;
 
        const uint8_t *array = bit_array;
        unsigned pos = cur_bit / 8;
@@ -225,71 +167,6 @@ next_set_bit(const void *bit_array, unsigned cur_bit, unsigned size_bits)
        }
 }
 
-/**
- * Print entry in struct xlat table, if there.
- *
- * @param val  Value to search a literal representation for.
- * @param dflt String (abbreviated in comment syntax) which should be emitted
- *             if no appropriate xlat value has been found.
- * @param xlat (And the following arguments) Pointers to arrays of xlat values.
- *             The last argument should be NULL.
- * @return     1 if appropriate xlat value has been found, 0 otherwise.
- */
-int
-printxvals(const uint64_t val, const char *dflt, const struct xlat *xlat, ...)
-{
-       va_list args;
-
-       va_start(args, xlat);
-       for (; xlat; xlat = va_arg(args, const struct xlat *)) {
-               const char *str = xlookup(xlat, val);
-
-               if (str) {
-                       tprints(str);
-                       va_end(args);
-                       return 1;
-               }
-       }
-       /* No hits -- print raw # instead. */
-       tprintf("%#" PRIx64, val);
-       tprints_comment(dflt);
-
-       va_end(args);
-
-       return 0;
-}
-
-/**
- * Print entry in sorted struct xlat table, if it is there.
- *
- * @param xlat      Pointer to an array of xlat values (not terminated with
- *                  XLAT_END).
- * @param xlat_size Number of xlat elements present in array (usually ARRAY_SIZE
- *                  if array is declared in the unit's scope and not
- *                  terminated with XLAT_END).
- * @param val       Value to search literal representation for.
- * @param dflt      String (abbreviated in comment syntax) which should be
- *                  emitted if no appropriate xlat value has been found.
- * @return          1 if appropriate xlat value has been found, 0
- *                  otherwise.
- */
-int
-printxval_searchn(const struct xlat *xlat, size_t xlat_size, uint64_t val,
-       const char *dflt)
-{
-       const char *s = xlat_search(xlat, xlat_size, val);
-
-       if (s) {
-               tprints(s);
-               return 1;
-       }
-
-       tprintf("%#" PRIx64, val);
-       tprints_comment(dflt);
-
-       return 0;
-}
-
 /*
  * Fetch 64bit argument at position arg_no and
  * return the index of the next argument.
@@ -313,10 +190,10 @@ getllval(struct tcb *tcp, unsigned long long *val, int arg_no)
                arg_no++;
        }
 #else /* SIZEOF_KERNEL_LONG_T == 4 */
-# if defined __ARM_EABI__ || \
-     defined LINUX_MIPSO32 || \
-     defined POWERPC || \
-     defined XTENSA
+# if defined __ARM_EABI__      \
+  || defined LINUX_MIPSO32     \
+  || defined POWERPC           \
+  || defined XTENSA
        /* Align arg_no to the next even number. */
        arg_no = (arg_no + 1) & 0xe;
 # elif defined SH
@@ -351,109 +228,13 @@ printllval(struct tcb *tcp, const char *format, int arg_no)
        return arg_no;
 }
 
-/*
- * Interpret `xlat' as an array of flags
- * print the entries whose bits are on in `flags'
- */
-void
-addflags(const struct xlat *xlat, uint64_t flags)
-{
-       for (; xlat->str; xlat++) {
-               if (xlat->val && (flags & xlat->val) == xlat->val) {
-                       tprintf("|%s", xlat->str);
-                       flags &= ~xlat->val;
-               }
-       }
-       if (flags) {
-               tprintf("|%#" PRIx64, flags);
-       }
-}
-
-/*
- * Interpret `xlat' as an array of flags.
- * Print to static string the entries whose bits are on in `flags'
- * Return static string.
- */
-const char *
-sprintflags(const char *prefix, const struct xlat *xlat, uint64_t flags)
-{
-       static char outstr[1024];
-       char *outptr;
-       int found = 0;
-
-       outptr = stpcpy(outstr, prefix);
-
-       if (flags == 0 && xlat->val == 0 && xlat->str) {
-               strcpy(outptr, xlat->str);
-               return outstr;
-       }
-
-       for (; xlat->str; xlat++) {
-               if (xlat->val && (flags & xlat->val) == xlat->val) {
-                       if (found)
-                               *outptr++ = '|';
-                       outptr = stpcpy(outptr, xlat->str);
-                       found = 1;
-                       flags &= ~xlat->val;
-                       if (!flags)
-                               break;
-               }
-       }
-       if (flags) {
-               if (found)
-                       *outptr++ = '|';
-               outptr += sprintf(outptr, "%#" PRIx64, flags);
-       }
-
-       return outstr;
-}
-
-int
-printflags64(const struct xlat *xlat, uint64_t flags, const char *dflt)
-{
-       int n;
-       const char *sep;
-
-       if (flags == 0 && xlat->val == 0 && xlat->str) {
-               tprints(xlat->str);
-               return 1;
-       }
-
-       sep = "";
-       for (n = 0; xlat->str; xlat++) {
-               if (xlat->val && (flags & xlat->val) == xlat->val) {
-                       tprintf("%s%s", sep, xlat->str);
-                       flags &= ~xlat->val;
-                       sep = "|";
-                       n++;
-               }
-       }
-
-       if (n) {
-               if (flags) {
-                       tprintf("%s%#" PRIx64, sep, flags);
-                       n++;
-               }
-       } else {
-               if (flags) {
-                       tprintf("%#" PRIx64, flags);
-                       tprints_comment(dflt);
-               } else {
-                       if (dflt)
-                               tprints("0");
-               }
-       }
-
-       return n;
-}
-
 void
-printaddr(const kernel_ulong_t addr)
+printaddr64(const uint64_t addr)
 {
        if (!addr)
                tprints("NULL");
        else
-               tprintf("%#" PRI_klx, addr);
+               tprintf("%#" PRIx64, addr);
 }
 
 #define DEF_PRINTNUM(name, type) \
@@ -478,7 +259,7 @@ printnum_addr_ ## name(struct tcb *tcp, const kernel_ulong_t addr)  \
        if (umove_or_printaddr(tcp, addr, &num))                        \
                return false;                                           \
        tprints("[");                                                   \
-       printaddr(num);                                                 \
+       printaddr64(num);                                               \
        tprints("]");                                                   \
        return true;                                                    \
 }
@@ -544,11 +325,14 @@ printnum_addr_klong_int(struct tcb *tcp, const kernel_ulong_t addr)
 
 /**
  * Prints time to a (static internal) buffer and returns pointer to it.
+ * Returns NULL if the provided time specification is not correct.
  *
  * @param sec          Seconds since epoch.
  * @param part_sec     Amount of second parts since the start of a second.
  * @param max_part_sec Maximum value of a valid part_sec.
  * @param width                1 + floor(log10(max_part_sec)).
+ * @return             Pointer to a statically allocated string on success,
+ *                     NULL on error.
  */
 static const char *
 sprinttime_ex(const long long sec, const unsigned long long part_sec,
@@ -569,15 +353,9 @@ sprinttime_ex(const long long sec, const unsigned long long part_sec,
        if (!pos)
                return NULL;
 
-       if (part_sec > 0) {
-               int ret = snprintf(buf + pos, sizeof(buf) - pos, ".%0*llu",
-                                  width, part_sec);
-
-               if (ret < 0 || (size_t) ret >= sizeof(buf) - pos)
-                       return NULL;
-
-               pos += ret;
-       }
+       if (part_sec > 0)
+               pos += xsnprintf(buf + pos, sizeof(buf) - pos, ".%0*llu",
+                                width, part_sec);
 
        return strftime(buf + pos, sizeof(buf) - pos, "%z", tmp) ? buf : NULL;
 }
@@ -612,7 +390,7 @@ getfdproto(struct tcb *tcp, int fd)
        if (fd < 0)
                return SOCK_PROTO_UNKNOWN;
 
-       sprintf(path, "/proc/%u/fd/%u", tcp->pid, fd);
+       xsprintf(path, "/proc/%u/fd/%u", tcp->pid, fd);
        r = getxattr(path, "system.sockprotoname", buf, bufsize - 1);
        if (r <= 0)
                return SOCK_PROTO_UNKNOWN;
@@ -630,24 +408,77 @@ getfdproto(struct tcb *tcp, int fd)
 #endif
 }
 
+unsigned long
+getfdinode(struct tcb *tcp, int fd)
+{
+       char path[PATH_MAX + 1];
+
+       if (getfdpath(tcp, fd, path, sizeof(path)) >= 0) {
+               const char *str = STR_STRIP_PREFIX(path, "socket:[");
+
+               if (str != path) {
+                       const size_t str_len = strlen(str);
+                       if (str_len && str[str_len - 1] == ']')
+                               return strtoul(str, NULL, 10);
+               }
+       }
+
+       return 0;
+}
+
+static bool
+printsocket(struct tcb *tcp, int fd, const char *path)
+{
+       const char *str = STR_STRIP_PREFIX(path, "socket:[");
+       size_t len;
+       unsigned long inode;
+
+       return (str != path)
+               && (len = strlen(str))
+               && (str[len - 1] == ']')
+               && (inode = strtoul(str, NULL, 10))
+               && print_sockaddr_by_inode(tcp, fd, inode);
+}
+
+static bool
+printdev(struct tcb *tcp, int fd, const char *path)
+{
+       struct_stat st;
+
+       if (path[0] != '/')
+               return false;
+
+       if (stat_file(path, &st)) {
+               debug_func_perror_msg("stat(\"%s\")", path);
+               return false;
+       }
+
+       switch (st.st_mode & S_IFMT) {
+       case S_IFBLK:
+       case S_IFCHR:
+               print_quoted_string_ex(path, strlen(path),
+                                      QUOTE_OMIT_LEADING_TRAILING_QUOTES,
+                                      "<>");
+               tprintf("<%s %u:%u>",
+                       S_ISBLK(st.st_mode)? "block" : "char",
+                       major(st.st_rdev), minor(st.st_rdev));
+               return true;
+       }
+
+       return false;
+}
+
 void
 printfd(struct tcb *tcp, int fd)
 {
        char path[PATH_MAX + 1];
        if (show_fd_path && getfdpath(tcp, fd, path, sizeof(path)) >= 0) {
-               const char *str;
-               size_t len;
-               unsigned long inode;
-
                tprintf("%d<", fd);
                if (show_fd_path <= 1
-                   || (str = STR_STRIP_PREFIX(path, "socket:[")) == path
-                   || !(len = strlen(str))
-                   || str[len - 1] != ']'
-                   || !(inode = strtoul(str, NULL, 10))
-                   || !print_sockaddr_by_inode(tcp, fd, inode)) {
-                       print_quoted_string(path, strlen(path),
-                                           QUOTE_OMIT_LEADING_TRAILING_QUOTES);
+                   || (!printsocket(tcp, fd, path)
+                        && !printdev(tcp, fd, path))) {
+                       print_quoted_string_ex(path, strlen(path),
+                               QUOTE_OMIT_LEADING_TRAILING_QUOTES, "<>");
                }
                tprints(">");
        } else
@@ -658,6 +489,9 @@ printfd(struct tcb *tcp, int fd)
  * Quote string `instr' of length `size'
  * Write up to (3 + `size' * 4) bytes to `outstr' buffer.
  *
+ * `escape_chars' specifies characters (in addition to characters with
+ * codes 0..31, 127..255, single and double quotes) that should be escaped.
+ *
  * If QUOTE_0_TERMINATED `style' flag is set,
  * treat `instr' as a NUL-terminated string,
  * checking up to (`size' + 1) bytes of `instr'.
@@ -670,12 +504,13 @@ printfd(struct tcb *tcp, int fd)
  */
 int
 string_quote(const char *instr, char *outstr, const unsigned int size,
-            const unsigned int style)
+            const unsigned int style, const char *escape_chars)
 {
        const unsigned char *ustr = (const unsigned char *) instr;
        char *s = outstr;
        unsigned int i;
        int usehex, c, eol;
+       bool escape;
 
        if (style & QUOTE_0_TERMINATED)
                eol = '\0';
@@ -709,6 +544,8 @@ string_quote(const char *instr, char *outstr, const unsigned int size,
                }
        }
 
+       if (style & QUOTE_EMIT_COMMENT)
+               s = stpcpy(s, " /* ");
        if (!(style & QUOTE_OMIT_LEADING_TRAILING_QUOTES))
                *s++ = '\"';
 
@@ -724,70 +561,79 @@ string_quote(const char *instr, char *outstr, const unsigned int size,
                        *s++ = "0123456789abcdef"[c >> 4];
                        *s++ = "0123456789abcdef"[c & 0xf];
                }
-       } else {
-               for (i = 0; i < size; ++i) {
-                       c = ustr[i];
-                       /* Check for NUL-terminated string. */
-                       if (c == eol)
-                               goto asciz_ended;
-                       if ((i == (size - 1)) &&
-                           (style & QUOTE_OMIT_TRAILING_0) && (c == '\0'))
-                               goto asciz_ended;
-                       switch (c) {
-                               case '\"': case '\\':
-                                       *s++ = '\\';
-                                       *s++ = c;
-                                       break;
-                               case '\f':
-                                       *s++ = '\\';
-                                       *s++ = 'f';
-                                       break;
-                               case '\n':
-                                       *s++ = '\\';
-                                       *s++ = 'n';
-                                       break;
-                               case '\r':
-                                       *s++ = '\\';
-                                       *s++ = 'r';
-                                       break;
-                               case '\t':
-                                       *s++ = '\\';
-                                       *s++ = 't';
-                                       break;
-                               case '\v':
-                                       *s++ = '\\';
-                                       *s++ = 'v';
-                                       break;
-                               default:
-                                       if (c >= ' ' && c <= 0x7e)
-                                               *s++ = c;
-                                       else {
-                                               /* Print \octal */
-                                               *s++ = '\\';
-                                               if (i + 1 < size
-                                                   && ustr[i + 1] >= '0'
-                                                   && ustr[i + 1] <= '9'
-                                               ) {
-                                                       /* Print \ooo */
+
+               goto string_ended;
+       }
+
+       for (i = 0; i < size; ++i) {
+               c = ustr[i];
+               /* Check for NUL-terminated string. */
+               if (c == eol)
+                       goto asciz_ended;
+               if ((i == (size - 1)) &&
+                   (style & QUOTE_OMIT_TRAILING_0) && (c == '\0'))
+                       goto asciz_ended;
+               switch (c) {
+               case '\"': case '\\':
+                       *s++ = '\\';
+                       *s++ = c;
+                       break;
+               case '\f':
+                       *s++ = '\\';
+                       *s++ = 'f';
+                       break;
+               case '\n':
+                       *s++ = '\\';
+                       *s++ = 'n';
+                       break;
+               case '\r':
+                       *s++ = '\\';
+                       *s++ = 'r';
+                       break;
+               case '\t':
+                       *s++ = '\\';
+                       *s++ = 't';
+                       break;
+               case '\v':
+                       *s++ = '\\';
+                       *s++ = 'v';
+                       break;
+               default:
+                       escape = (c < ' ') || (c > 0x7e);
+
+                       if (!escape && escape_chars)
+                               escape = !!strchr(escape_chars, c);
+
+                       if (!escape) {
+                               *s++ = c;
+                       } else {
+                               /* Print \octal */
+                               *s++ = '\\';
+                               if (i + 1 < size
+                                   && ustr[i + 1] >= '0'
+                                   && ustr[i + 1] <= '7'
+                               ) {
+                                       /* Print \ooo */
+                                       *s++ = '0' + (c >> 6);
+                                       *s++ = '0' + ((c >> 3) & 0x7);
+                               } else {
+                                       /* Print \[[o]o]o */
+                                       if ((c >> 3) != 0) {
+                                               if ((c >> 6) != 0)
                                                        *s++ = '0' + (c >> 6);
-                                                       *s++ = '0' + ((c >> 3) & 0x7);
-                                               } else {
-                                                       /* Print \[[o]o]o */
-                                                       if ((c >> 3) != 0) {
-                                                               if ((c >> 6) != 0)
-                                                                       *s++ = '0' + (c >> 6);
-                                                               *s++ = '0' + ((c >> 3) & 0x7);
-                                                       }
-                                               }
-                                               *s++ = '0' + (c & 0x7);
+                                               *s++ = '0' + ((c >> 3) & 0x7);
                                        }
-                                       break;
+                               }
+                               *s++ = '0' + (c & 0x7);
                        }
                }
        }
 
+ string_ended:
        if (!(style & QUOTE_OMIT_LEADING_TRAILING_QUOTES))
                *s++ = '\"';
+       if (style & QUOTE_EMIT_COMMENT)
+               s = stpcpy(s, " */");
        *s = '\0';
 
        /* Return zero if we printed entire ASCIZ string (didn't truncate it) */
@@ -803,6 +649,8 @@ string_quote(const char *instr, char *outstr, const unsigned int size,
  asciz_ended:
        if (!(style & QUOTE_OMIT_LEADING_TRAILING_QUOTES))
                *s++ = '\"';
+       if (style & QUOTE_EMIT_COMMENT)
+               s = stpcpy(s, " */");
        *s = '\0';
        /* Return zero: we printed entire ASCIZ string (didn't truncate it) */
        return 0;
@@ -827,8 +675,8 @@ string_quote(const char *instr, char *outstr, const unsigned int size,
  * Note that if QUOTE_0_TERMINATED is not set, always returns 1.
  */
 int
-print_quoted_string(const char *str, unsigned int size,
-                   const unsigned int style)
+print_quoted_string_ex(const char *str, unsigned int size,
+                      const unsigned int style, const char *escape_chars)
 {
        char *buf;
        char *outstr;
@@ -840,11 +688,13 @@ print_quoted_string(const char *str, unsigned int size,
 
        alloc_size = 4 * size;
        if (alloc_size / 4 != size) {
-               error_msg("Out of memory");
+               error_func_msg("requested %u bytes exceeds %u bytes limit",
+                              size, -1U / 4);
                tprints("???");
                return -1;
        }
-       alloc_size += 1 + (style & QUOTE_OMIT_LEADING_TRAILING_QUOTES ? 0 : 2);
+       alloc_size += 1 + (style & QUOTE_OMIT_LEADING_TRAILING_QUOTES ? 0 : 2) +
+               (style & QUOTE_EMIT_COMMENT ? 7 : 0);
 
        if (use_alloca(alloc_size)) {
                outstr = alloca(alloc_size);
@@ -852,55 +702,83 @@ print_quoted_string(const char *str, unsigned int size,
        } else {
                outstr = buf = malloc(alloc_size);
                if (!buf) {
-                       error_msg("Out of memory");
+                       error_func_msg("memory exhausted when tried to allocate"
+                                      " %u bytes", alloc_size);
                        tprints("???");
                        return -1;
                }
        }
 
-       rc = string_quote(str, outstr, size, style);
+       rc = string_quote(str, outstr, size, style, escape_chars);
        tprints(outstr);
 
        free(buf);
        return rc;
 }
 
+inline int
+print_quoted_string(const char *str, unsigned int size,
+                   const unsigned int style)
+{
+       return print_quoted_string_ex(str, size, style, NULL);
+}
+
+/*
+ * Quote a NUL-terminated string `str' of length up to `size' - 1
+ * and print the result.
+ *
+ * Returns 0 if NUL was seen, 1 otherwise.
+ */
+int
+print_quoted_cstring(const char *str, unsigned int size)
+{
+       int unterminated =
+               print_quoted_string(str, size, QUOTE_0_TERMINATED);
+
+       if (unterminated)
+               tprints("...");
+
+       return unterminated;
+}
+
 /*
  * Print path string specified by address `addr' and length `n'.
  * If path length exceeds `n', append `...' to the output.
+ *
+ * Returns the result of umovenstr.
  */
-void
+int
 printpathn(struct tcb *const tcp, const kernel_ulong_t addr, unsigned int n)
 {
-       char path[PATH_MAX + 1];
+       char path[PATH_MAX];
        int nul_seen;
 
        if (!addr) {
                tprints("NULL");
-               return;
+               return -1;
        }
 
        /* Cap path length to the path buffer size */
-       if (n > sizeof path - 1)
-               n = sizeof path - 1;
+       if (n > sizeof(path) - 1)
+               n = sizeof(path) - 1;
 
        /* Fetch one byte more to find out whether path length > n. */
        nul_seen = umovestr(tcp, addr, n + 1, path);
        if (nul_seen < 0)
                printaddr(addr);
        else {
-               path[n++] = '\0';
-               print_quoted_string(path, n, QUOTE_0_TERMINATED);
-               if (!nul_seen)
-                       tprints("...");
+               path[n++] = !nul_seen;
+               print_quoted_cstring(path, n);
        }
+
+       return nul_seen;
 }
 
-void
+int
 printpath(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        /* Size must correspond to char path[] size in printpathn */
-       printpathn(tcp, addr, PATH_MAX);
+       return printpathn(tcp, addr, PATH_MAX - 1);
 }
 
 /*
@@ -910,13 +788,17 @@ printpath(struct tcb *const tcp, const kernel_ulong_t addr)
  * Pass `user_style' on to `string_quote'.
  * Append `...' to the output if either the string length exceeds `max_strlen',
  * or QUOTE_0_TERMINATED bit is set and the string length exceeds `len'.
+ *
+ * Returns the result of umovenstr if style has QUOTE_0_TERMINATED,
+ * or the result of umoven otherwise.
  */
-void
+int
 printstr_ex(struct tcb *const tcp, const kernel_ulong_t addr,
            const kernel_ulong_t len, const unsigned int user_style)
 {
-       static char *str = NULL;
+       static char *str;
        static char *outstr;
+
        unsigned int size;
        unsigned int style = user_style;
        int rc;
@@ -924,14 +806,17 @@ printstr_ex(struct tcb *const tcp, const kernel_ulong_t addr,
 
        if (!addr) {
                tprints("NULL");
-               return;
+               return -1;
        }
        /* Allocate static buffers if they are not allocated yet. */
        if (!str) {
-               unsigned int outstr_size = 4 * max_strlen + /*for quotes and NUL:*/ 3;
+               const unsigned int outstr_size =
+                       4 * max_strlen + /* for quotes and NUL */ 3;
+               /*
+                * We can assume that outstr_size / 4 == max_strlen
+                * since we have a guarantee that max_strlen <= -1U / 4.
+                */
 
-               if (outstr_size / 4 != max_strlen)
-                       die_out_of_memory();
                str = xmalloc(max_strlen + 1);
                outstr = xmalloc(outstr_size);
        }
@@ -948,7 +833,7 @@ printstr_ex(struct tcb *const tcp, const kernel_ulong_t addr,
 
        if (rc < 0) {
                printaddr(addr);
-               return;
+               return rc;
        }
 
        if (size > max_strlen)
@@ -959,7 +844,7 @@ printstr_ex(struct tcb *const tcp, const kernel_ulong_t addr,
        /* If string_quote didn't see NUL and (it was supposed to be ASCIZ str
         * or we were requested to print more than -s NUM chars)...
         */
-       ellipsis = string_quote(str, outstr, size, style)
+       ellipsis = string_quote(str, outstr, size, style, NULL)
                   && len
                   && ((style & QUOTE_0_TERMINATED)
                       || len > max_strlen);
@@ -967,6 +852,8 @@ printstr_ex(struct tcb *const tcp, const kernel_ulong_t addr,
        tprints(outstr);
        if (ellipsis)
                tprints("...");
+
+       return rc;
 }
 
 void
@@ -980,25 +867,30 @@ dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ulong_t addr,
        } iovu;
 #define iov iovu.iov64
 #define sizeof_iov \
-       (current_wordsize == 4 ? sizeof(*iovu.iov32) : sizeof(*iovu.iov64))
+       (current_wordsize == 4 ? (unsigned int) sizeof(*iovu.iov32)     \
+                              : (unsigned int) sizeof(*iovu.iov64))
 #define iov_iov_base(i) \
        (current_wordsize == 4 ? (uint64_t) iovu.iov32[i].base : iovu.iov64[i].base)
 #define iov_iov_len(i) \
        (current_wordsize == 4 ? (uint64_t) iovu.iov32[i].len : iovu.iov64[i].len)
 #else
        struct iovec *iov;
-#define sizeof_iov sizeof(*iov)
+#define sizeof_iov ((unsigned int) sizeof(*iov))
 #define iov_iov_base(i) ptr_to_kulong(iov[i].iov_base)
 #define iov_iov_len(i) iov[i].iov_len
 #endif
        int i;
-       unsigned size;
+       unsigned int size = sizeof_iov * len;
+       if (size / sizeof_iov != (unsigned int) len) {
+               error_func_msg("requested %u iovec elements exceeds"
+                              " %u iovec limit", len, -1U / sizeof_iov);
+               return;
+       }
 
-       size = sizeof_iov * len;
-       /* Assuming no sane program has millions of iovs */
-       if ((unsigned)len > 1024*1024 /* insane or negative size? */
-           || (iov = malloc(size)) == NULL) {
-               error_msg("Out of memory");
+       iov = malloc(size);
+       if (!iov) {
+               error_func_msg("memory exhausted when tried to allocate"
+                              " %u bytes", size);
                return;
        }
        if (umoven(tcp, addr, size, iov) >= 0) {
@@ -1038,6 +930,9 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
        const unsigned char *src;
        int i;
 
+       if ((len < 0) || (len > INT_MAX - 16))
+               return;
+
        memset(outbuf, ' ', sizeof(outbuf));
 
        if (strsize < len + 16) {
@@ -1045,7 +940,8 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
                str = malloc(len + 16);
                if (!str) {
                        strsize = -1;
-                       error_msg("Out of memory");
+                       error_func_msg("memory exhausted when tried to allocate"
+                                      " %zu bytes", (size_t) (len + 16));
                        return;
                }
                strsize = len + 16;
@@ -1068,8 +964,7 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
                        if (i < len) {
                                *dst++ = "0123456789abcdef"[*src >> 4];
                                *dst++ = "0123456789abcdef"[*src & 0xf];
-                       }
-                       else {
+                       } else {
                                *dst++ = ' ';
                                *dst++ = ' ';
                        }
@@ -1094,343 +989,70 @@ dumpstr(struct tcb *const tcp, const kernel_ulong_t addr, const int len)
        }
 }
 
-static bool process_vm_readv_not_supported = 0;
-#ifndef HAVE_PROCESS_VM_READV
-/*
- * Need to do this since process_vm_readv() is not yet available in libc.
- * When libc is be updated, only "static bool process_vm_readv_not_supported"
- * line should remain.
- */
-/* Have to avoid duplicating with the C library headers. */
-static ssize_t strace_process_vm_readv(pid_t pid,
-                const struct iovec *lvec,
-                unsigned long liovcnt,
-                const struct iovec *rvec,
-                unsigned long riovcnt,
-                unsigned long flags)
+bool
+tfetch_mem64(struct tcb *const tcp, const uint64_t addr,
+            const unsigned int len, void *const our_addr)
 {
-       return syscall(__NR_process_vm_readv, (long)pid, lvec, liovcnt, rvec, riovcnt, flags);
+       return addr && verbose(tcp) &&
+              (entering(tcp) || !syserror(tcp)) &&
+              !umoven(tcp, addr, len, our_addr);
 }
-# define process_vm_readv strace_process_vm_readv
-#endif /* !HAVE_PROCESS_VM_READV */
 
-static ssize_t
-vm_read_mem(const pid_t pid, void *const laddr,
-           const kernel_ulong_t raddr, const size_t len)
+bool
+tfetch_mem64_ignore_syserror(struct tcb *const tcp, const uint64_t addr,
+                            const unsigned int len, void *const our_addr)
 {
-       const unsigned long truncated_raddr = raddr;
-
-       if (raddr != (kernel_ulong_t) truncated_raddr) {
-               errno = EIO;
-               return -1;
-       }
-
-       const struct iovec local = {
-               .iov_base = laddr,
-               .iov_len = len
-       };
-       const struct iovec remote = {
-               .iov_base = (void *) truncated_raddr,
-               .iov_len = len
-       };
-
-       return process_vm_readv(pid, &local, 1, &remote, 1, 0);
+       return addr && verbose(tcp) &&
+              !umoven(tcp, addr, len, our_addr);
 }
 
-/*
- * move `len' bytes of data from process `pid'
- * at address `addr' to our space at `our_addr'
- */
 int
-umoven(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len,
-       void *const our_addr)
+umoven_or_printaddr64(struct tcb *const tcp, const uint64_t addr,
+                     const unsigned int len, void *const our_addr)
 {
-       char *laddr = our_addr;
-       int pid = tcp->pid;
-       unsigned int n, m, nread;
-       union {
-               long val;
-               char x[sizeof(long)];
-       } u;
-
-#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
-       if (current_wordsize < sizeof(addr)
-           && (addr & (~ (kernel_ulong_t) -1U))) {
-               return -1;
-       }
-#endif
-
-       if (!process_vm_readv_not_supported) {
-               int r = vm_read_mem(pid, laddr, addr, len);
-               if ((unsigned int) r == len)
-                       return 0;
-               if (r >= 0) {
-                       error_msg("umoven: short read (%u < %u) @0x%" PRI_klx,
-                                 (unsigned int) r, len, addr);
-                       return -1;
-               }
-               switch (errno) {
-                       case ENOSYS:
-                               process_vm_readv_not_supported = 1;
-                               break;
-                       case EPERM:
-                               /* operation not permitted, try PTRACE_PEEKDATA */
-                               break;
-                       case ESRCH:
-                               /* the process is gone */
-                               return -1;
-                       case EFAULT: case EIO:
-                               /* address space is inaccessible */
-                               return -1;
-                       default:
-                               /* all the rest is strange and should be reported */
-                               perror_msg("process_vm_readv");
-                               return -1;
-               }
-       }
-
-       nread = 0;
-       if (addr & (sizeof(long) - 1)) {
-               /* addr not a multiple of sizeof(long) */
-               n = addr & (sizeof(long) - 1);  /* residue */
-               addr &= -sizeof(long);          /* aligned address */
-               errno = 0;
-               u.val = ptrace(PTRACE_PEEKDATA, pid, addr, 0);
-               switch (errno) {
-                       case 0:
-                               break;
-                       case ESRCH: case EINVAL:
-                               /* these could be seen if the process is gone */
-                               return -1;
-                       case EFAULT: case EIO: case EPERM:
-                               /* address space is inaccessible */
-                               return -1;
-                       default:
-                               /* all the rest is strange and should be reported */
-                               perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
-                                           pid, addr);
-                               return -1;
-               }
-               m = MIN(sizeof(long) - n, len);
-               memcpy(laddr, &u.x[n], m);
-               addr += sizeof(long);
-               laddr += m;
-               nread += m;
-               len -= m;
-       }
-       while (len) {
-               errno = 0;
-               u.val = ptrace(PTRACE_PEEKDATA, pid, addr, 0);
-               switch (errno) {
-                       case 0:
-                               break;
-                       case ESRCH: case EINVAL:
-                               /* these could be seen if the process is gone */
-                               return -1;
-                       case EFAULT: case EIO: case EPERM:
-                               /* address space is inaccessible */
-                               if (nread) {
-                                       perror_msg("umoven: short read (%u < %u) @0x%" PRI_klx,
-                                                  nread, nread + len, addr - nread);
-                               }
-                               return -1;
-                       default:
-                               /* all the rest is strange and should be reported */
-                               perror_msg("umoven: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
-                                           pid, addr);
-                               return -1;
-               }
-               m = MIN(sizeof(long), len);
-               memcpy(laddr, u.x, m);
-               addr += sizeof(long);
-               laddr += m;
-               nread += m;
-               len -= m;
-       }
-
-       return 0;
+       if (tfetch_mem64(tcp, addr, len, our_addr))
+               return 0;
+       printaddr64(addr);
+       return -1;
 }
 
 int
-umoven_or_printaddr(struct tcb *const tcp, const kernel_ulong_t addr,
-                   const unsigned int len, void *const our_addr)
+umoven_or_printaddr64_ignore_syserror(struct tcb *const tcp,
+                                     const uint64_t addr,
+                                     const unsigned int len,
+                                     void *const our_addr)
 {
-       if (!addr || !verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
-           umoven(tcp, addr, len, our_addr) < 0) {
-               printaddr(addr);
-               return -1;
-       }
-       return 0;
+       if (tfetch_mem64_ignore_syserror(tcp, addr, len, our_addr))
+               return 0;
+       printaddr64(addr);
+       return -1;
 }
 
-int
-umoven_or_printaddr_ignore_syserror(struct tcb *const tcp,
-                                   const kernel_ulong_t addr,
-                                   const unsigned int len,
-                                   void *const our_addr)
+bool
+print_int32_array_member(struct tcb *tcp, void *elem_buf, size_t elem_size,
+                        void *data)
 {
-       if (!addr || !verbose(tcp) || umoven(tcp, addr, len, our_addr) < 0) {
-               printaddr(addr);
-               return -1;
-       }
-       return 0;
+       tprintf("%" PRId32, *(int32_t *) elem_buf);
+
+       return true;
 }
 
-/*
- * Like `umove' but make the additional effort of looking
- * for a terminating zero byte.
- *
- * Returns < 0 on error, > 0 if NUL was seen,
- * (TODO if useful: return count of bytes including NUL),
- * else 0 if len bytes were read but no NUL byte seen.
- *
- * Note: there is no guarantee we won't overwrite some bytes
- * in laddr[] _after_ terminating NUL (but, of course,
- * we never write past laddr[len-1]).
- */
-int
-umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *laddr)
+bool
+print_uint32_array_member(struct tcb *tcp, void *elem_buf, size_t elem_size,
+                         void *data)
 {
-       const unsigned long x01010101 = (unsigned long) 0x0101010101010101ULL;
-       const unsigned long x80808080 = (unsigned long) 0x8080808080808080ULL;
-
-       int pid = tcp->pid;
-       unsigned int n, m, nread;
-       union {
-               unsigned long val;
-               char x[sizeof(long)];
-       } u;
-
-#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
-       if (current_wordsize < sizeof(addr)
-           && (addr & (~ (kernel_ulong_t) -1U))) {
-               return -1;
-       }
-#endif
+       tprintf("%" PRIu32, *(uint32_t *) elem_buf);
 
-       nread = 0;
-       if (!process_vm_readv_not_supported) {
-               const size_t page_size = get_pagesize();
-               const size_t page_mask = page_size - 1;
-
-               while (len > 0) {
-                       unsigned int chunk_len;
-                       unsigned int end_in_page;
+       return true;
+}
 
-                       /*
-                        * Don't cross pages, otherwise we can get EFAULT
-                        * and fail to notice that terminating NUL lies
-                        * in the existing (first) page.
-                        */
-                       chunk_len = len > page_size ? page_size : len;
-                       end_in_page = (addr + chunk_len) & page_mask;
-                       if (chunk_len > end_in_page) /* crosses to the next page */
-                               chunk_len -= end_in_page;
-
-                       int r = vm_read_mem(pid, laddr, addr, chunk_len);
-                       if (r > 0) {
-                               if (memchr(laddr, '\0', r))
-                                       return 1;
-                               addr += r;
-                               laddr += r;
-                               nread += r;
-                               len -= r;
-                               continue;
-                       }
-                       switch (errno) {
-                               case ENOSYS:
-                                       process_vm_readv_not_supported = 1;
-                                       goto vm_readv_didnt_work;
-                               case ESRCH:
-                                       /* the process is gone */
-                                       return -1;
-                               case EPERM:
-                                       /* operation not permitted, try PTRACE_PEEKDATA */
-                                       if (!nread)
-                                               goto vm_readv_didnt_work;
-                                       /* fall through */
-                               case EFAULT: case EIO:
-                                       /* address space is inaccessible */
-                                       if (nread) {
-                                               perror_msg("umovestr: short read (%d < %d) @0x%" PRI_klx,
-                                                          nread, nread + len, addr - nread);
-                                       }
-                                       return -1;
-                               default:
-                                       /* all the rest is strange and should be reported */
-                                       perror_msg("process_vm_readv");
-                                       return -1;
-                       }
-               }
-               return 0;
-       }
- vm_readv_didnt_work:
-
-       if (addr & (sizeof(long) - 1)) {
-               /* addr not a multiple of sizeof(long) */
-               n = addr & (sizeof(long) - 1);  /* residue */
-               addr &= -sizeof(long);          /* aligned address */
-               errno = 0;
-               u.val = ptrace(PTRACE_PEEKDATA, pid, addr, 0);
-               switch (errno) {
-                       case 0:
-                               break;
-                       case ESRCH: case EINVAL:
-                               /* these could be seen if the process is gone */
-                               return -1;
-                       case EFAULT: case EIO: case EPERM:
-                               /* address space is inaccessible */
-                               return -1;
-                       default:
-                               /* all the rest is strange and should be reported */
-                               perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
-                                           pid, addr);
-                               return -1;
-               }
-               m = MIN(sizeof(long) - n, len);
-               memcpy(laddr, &u.x[n], m);
-               while (n & (sizeof(long) - 1))
-                       if (u.x[n++] == '\0')
-                               return 1;
-               addr += sizeof(long);
-               laddr += m;
-               nread += m;
-               len -= m;
-       }
+bool
+print_uint64_array_member(struct tcb *tcp, void *elem_buf, size_t elem_size,
+                         void *data)
+{
+       tprintf("%" PRIu64, *(uint64_t *) elem_buf);
 
-       while (len) {
-               errno = 0;
-               u.val = ptrace(PTRACE_PEEKDATA, pid, addr, 0);
-               switch (errno) {
-                       case 0:
-                               break;
-                       case ESRCH: case EINVAL:
-                               /* these could be seen if the process is gone */
-                               return -1;
-                       case EFAULT: case EIO: case EPERM:
-                               /* address space is inaccessible */
-                               if (nread) {
-                                       perror_msg("umovestr: short read (%d < %d) @0x%" PRI_klx,
-                                                  nread, nread + len, addr - nread);
-                               }
-                               return -1;
-                       default:
-                               /* all the rest is strange and should be reported */
-                               perror_msg("umovestr: PTRACE_PEEKDATA pid:%d @0x%" PRI_klx,
-                                          pid, addr);
-                               return -1;
-               }
-               m = MIN(sizeof(long), len);
-               memcpy(laddr, u.x, m);
-               /* "If a NUL char exists in this word" */
-               if ((u.val - x01010101) & ~u.val & x80808080)
-                       return 1;
-               addr += sizeof(long);
-               laddr += m;
-               nread += m;
-               len -= m;
-       }
-       return 0;
+       return true;
 }
 
 /*
@@ -1439,8 +1061,8 @@ umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *lad
  *
  * Array elements are being fetched to the address specified by elem_buf.
  *
- * The fetcher callback function specified by umoven_func should follow
- * the same semantics as umoven_or_printaddr function.
+ * The fetcher callback function specified by tfetch_mem_func should follow
+ * the same semantics as tfetch_mem function.
  *
  * The printer callback function specified by print_func is expected
  * to print something; if it returns false, no more iterations will be made.
@@ -1452,9 +1074,7 @@ umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *lad
  * - "NULL", if start_addr is NULL;
  * - "[]", if nmemb is 0;
  * - start_addr, if nmemb * elem_size overflows or wraps around;
- * - nothing, if the first element cannot be fetched
- *   (if umoven_func returns non-zero), but it is assumed that
- *   umoven_func has printed the address it failed to fetch data from;
+ * - start_addr, if the first tfetch_mem_func invocation returned false;
  * - elements of the array, delimited by ", ", with the array itself
  *   enclosed with [] brackets.
  *
@@ -1463,25 +1083,22 @@ umovestr(struct tcb *const tcp, kernel_ulong_t addr, unsigned int len, char *lad
  * - "..." is printed instead of max_strlen+1 element
  *   and no more iterations will be made.
  *
- * This function returns true only if
- * - umoven_func has been called at least once AND
- * - umoven_func has not returned false.
+ * This function returns true only if tfetch_mem_func has returned true
+ * at least once.
  */
 bool
-print_array(struct tcb *const tcp,
-           const kernel_ulong_t start_addr,
-           const size_t nmemb,
-           void *const elem_buf,
-           const size_t elem_size,
-           int (*const umoven_func)(struct tcb *,
-                                    kernel_ulong_t,
-                                    unsigned int,
-                                    void *),
-           bool (*const print_func)(struct tcb *,
-                                    void *elem_buf,
-                                    size_t elem_size,
-                                    void *opaque_data),
-           void *const opaque_data)
+print_array_ex(struct tcb *const tcp,
+              const kernel_ulong_t start_addr,
+              const size_t nmemb,
+              void *const elem_buf,
+              const size_t elem_size,
+              tfetch_mem_fn tfetch_mem_func,
+              print_fn print_func,
+              void *const opaque_data,
+              unsigned int flags,
+              const struct xlat *index_xlat,
+              size_t index_xlat_size,
+              const char *index_dflt)
 {
        if (!start_addr) {
                tprints("NULL");
@@ -1505,13 +1122,22 @@ print_array(struct tcb *const tcp,
                (abbrev(tcp) && max_strlen < nmemb) ?
                        start_addr + elem_size * max_strlen : end_addr;
        kernel_ulong_t cur;
+       kernel_ulong_t idx = 0;
+       enum xlat_style xlat_style = flags & XLAT_STYLE_MASK;
 
-       for (cur = start_addr; cur < end_addr; cur += elem_size) {
+       for (cur = start_addr; cur < end_addr; cur += elem_size, idx++) {
                if (cur != start_addr)
                        tprints(", ");
 
-               if (umoven_func(tcp, cur, elem_size, elem_buf))
+               if (!tfetch_mem_func(tcp, cur, elem_size, elem_buf)) {
+                       if (cur == start_addr)
+                               printaddr(cur);
+                       else {
+                               tprints("...");
+                               printaddr_comment(cur);
+                       }
                        break;
+               }
 
                if (cur == start_addr)
                        tprints("[");
@@ -1522,6 +1148,25 @@ print_array(struct tcb *const tcp,
                        break;
                }
 
+               if (flags & PAF_PRINT_INDICES) {
+                       tprints("[");
+
+                       if (!index_xlat) {
+                               print_xlat_ex(idx, NULL, xlat_style);
+                       } else if (flags & PAF_INDEX_XLAT_VALUE_INDEXED) {
+                               printxval_indexn_ex(index_xlat,
+                                                   index_xlat_size, idx,
+                                                   index_dflt, xlat_style);
+                       } else {
+                               printxvals_ex(idx, index_dflt, xlat_style,
+                                             (flags & PAF_INDEX_XLAT_SORTED)
+                                               && idx ? NULL : index_xlat,
+                                             NULL);
+                       }
+
+                       tprints("] = ");
+               }
+
                if (!print_func(tcp, elem_buf, elem_size, opaque_data)) {
                        cur = end_addr;
                        break;
@@ -1583,7 +1228,7 @@ print_abnormal_hi(const kernel_ulong_t val)
 #endif
 
 int
-read_int_from_file(const char *const fname, int *const pvalue)
+read_int_from_file(struct tcb *tcp, const char *const fname, int *const pvalue)
 {
        const int fd = open_file(fname, O_RDONLY);
        if (fd < 0)