io: change size types from unsigned long to kernel_ureg_t

[strace] / util.c

diff --git a/util.c b/util.c
index 4ec43da7950810fc0e5c1b9f93a4149802c36755..72c5251efd05ae68d190919eb8c199f62dfdc73a 100644 (file)
--- a/util.c
+++ b/util.c
@@ -303,7 +303,7 @@ getllval(struct tcb *tcp, unsigned long long *val, int arg_no)
                /* Align arg_no to the next even number. */
                arg_no = (arg_no + 1) & 0xe;
 #  endif /* AARCH64 || POWERPC64 */
-               *val = LONG_LONG(tcp->u_arg[arg_no], tcp->u_arg[arg_no + 1]);
+               *val = ULONG_LONG(tcp->u_arg[arg_no], tcp->u_arg[arg_no + 1]);
                arg_no += 2;
        } else
 # endif /* !current_klongsize */
@@ -316,7 +316,7 @@ getllval(struct tcb *tcp, unsigned long long *val, int arg_no)
 #elif HAVE_STRUCT_TCB_EXT_ARG
 # ifndef current_klongsize
        if (current_klongsize < SIZEOF_LONG_LONG) {
-               *val = LONG_LONG(tcp->u_arg[arg_no], tcp->u_arg[arg_no + 1]);
+               *val = ULONG_LONG(tcp->u_arg[arg_no], tcp->u_arg[arg_no + 1]);
                arg_no += 2;
        } else
 # endif /* !current_klongsize */
@@ -342,7 +342,7 @@ getllval(struct tcb *tcp, unsigned long long *val, int arg_no)
        if (arg_no == 3)
                arg_no++;
 # endif /* __ARM_EABI__ || LINUX_MIPSO32 || POWERPC || XTENSA || SH */
-       *val = LONG_LONG(tcp->u_arg[arg_no], tcp->u_arg[arg_no + 1]);
+       *val = ULONG_LONG(tcp->u_arg[arg_no], tcp->u_arg[arg_no + 1]);
        arg_no += 2;
 #endif
 
@@ -472,7 +472,8 @@ printaddr_klu(const kernel_ulong_t addr)
 
 #define DEF_PRINTNUM(name, type) \
 bool                                                                   \
-printnum_ ## name(struct tcb *tcp, const long addr, const char *fmt)   \
+printnum_ ## name(struct tcb *const tcp, const kernel_ureg_t addr,     \
+                 const char *const fmt)                                \
 {                                                                      \
        type num;                                                       \
        if (umove_or_printaddr(tcp, addr, &num))                        \
@@ -485,7 +486,8 @@ printnum_ ## name(struct tcb *tcp, const long addr, const char *fmt)        \
 
 #define DEF_PRINTPAIR(name, type) \
 bool                                                                   \
-printpair_ ## name(struct tcb *tcp, const long addr, const char *fmt)  \
+printpair_ ## name(struct tcb *const tcp, const kernel_ureg_t addr,    \
+                  const char *const fmt)                               \
 {                                                                      \
        type pair[2];                                                   \
        if (umove_or_printaddr(tcp, addr, &pair))                       \
@@ -506,8 +508,8 @@ DEF_PRINTPAIR(int64, uint64_t)
 
 #if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
 bool
-printnum_long_int(struct tcb *tcp, const long addr,
-                 const char *fmt_long, const char *fmt_int)
+printnum_long_int(struct tcb *const tcp, const kernel_ureg_t addr,
+                 const char *const fmt_long, const char *const fmt_int)
 {
        if (current_wordsize > sizeof(int)) {
                return printnum_int64(tcp, addr, fmt_long);
@@ -813,7 +815,7 @@ print_quoted_string(const char *str, unsigned int size,
  * If path length exceeds `n', append `...' to the output.
  */
 void
-printpathn(struct tcb *tcp, long addr, unsigned int n)
+printpathn(struct tcb *const tcp, const kernel_ureg_t addr, unsigned int n)
 {
        char path[PATH_MAX + 1];
        int nul_seen;
@@ -840,7 +842,7 @@ printpathn(struct tcb *tcp, long addr, unsigned int n)
 }
 
 void
-printpath(struct tcb *tcp, long addr)
+printpath(struct tcb *const tcp, const kernel_ureg_t addr)
 {
        /* Size must correspond to char path[] size in printpathn */
        printpathn(tcp, addr, PATH_MAX);
@@ -848,15 +850,15 @@ printpath(struct tcb *tcp, long addr)
 
 /*
  * Print string specified by address `addr' and length `len'.
- * If `len' == -1, set QUOTE_0_TERMINATED bit in `user_style'.
  * If `user_style' has QUOTE_0_TERMINATED bit set, treat the string
  * as a NUL-terminated string.
  * Pass `user_style' on to `string_quote'.
  * Append `...' to the output if either the string length exceeds `max_strlen',
- * or `len' != -1 and the string length exceeds `len'.
+ * or QUOTE_0_TERMINATED bit is set and the string length exceeds `len'.
  */
 void
-printstr_ex(struct tcb *tcp, long addr, long len, unsigned int user_style)
+printstr_ex(struct tcb *const tcp, const kernel_ureg_t addr,
+           const kernel_ureg_t len, const unsigned int user_style)
 {
        static char *str = NULL;
        static char *outstr;
@@ -879,22 +881,16 @@ printstr_ex(struct tcb *tcp, long addr, long len, unsigned int user_style)
                outstr = xmalloc(outstr_size);
        }
 
+       /* Fetch one byte more because string_quote may look one byte ahead. */
        size = max_strlen + 1;
-       if (len == -1) {
-               /*
-                * Treat as a NUL-terminated string: fetch one byte more
-                * because string_quote may look one byte ahead.
-                */
-               style |= QUOTE_0_TERMINATED;
+
+       if (size > len)
+               size = len;
+       if (style & QUOTE_0_TERMINATED)
                rc = umovestr(tcp, addr, size, str);
-       } else {
-               if (size > (unsigned long) len)
-                       size = (unsigned long) len;
-               if (style & QUOTE_0_TERMINATED)
-                       rc = umovestr(tcp, addr, size, str);
-               else
-                       rc = umoven(tcp, addr, size, str);
-       }
+       else
+               rc = umoven(tcp, addr, size, str);
+
        if (rc < 0) {
                printaddr(addr);
                return;
@@ -911,7 +907,7 @@ printstr_ex(struct tcb *tcp, long addr, long len, unsigned int user_style)
        ellipsis = string_quote(str, outstr, size, style)
                   && len
                   && ((style & QUOTE_0_TERMINATED)
-                      || (unsigned long) len > max_strlen);
+                      || len > max_strlen);
 
        tprints(outstr);
        if (ellipsis)
@@ -919,7 +915,8 @@ printstr_ex(struct tcb *tcp, long addr, long len, unsigned int user_style)
 }
 
 void
-dumpiov_upto(struct tcb *tcp, int len, long addr, unsigned long data_size)
+dumpiov_upto(struct tcb *const tcp, const int len, const kernel_ureg_t addr,
+            unsigned long data_size)
 {
 #if SUPPORTED_PERSONALITIES > 1
        union {
@@ -960,7 +957,7 @@ dumpiov_upto(struct tcb *tcp, int len, long addr, unsigned long data_size)
                        /* include the buffer number to make it easy to
                         * match up the trace with the source */
                        tprintf(" * %lu bytes in buffer %d\n", iov_len, i);
-                       dumpstr(tcp, (long) iov_iov_base(i), iov_len);
+                       dumpstr(tcp, (kernel_ureg_t) iov_iov_base(i), iov_len);
                }
        }
        free(iov);
@@ -971,7 +968,7 @@ dumpiov_upto(struct tcb *tcp, int len, long addr, unsigned long data_size)
 }
 
 void
-dumpstr(struct tcb *tcp, long addr, int len)
+dumpstr(struct tcb *const tcp, const kernel_ureg_t addr, const int len)
 {
        static int strsize = -1;
        static unsigned char *str;
@@ -1082,7 +1079,8 @@ static bool process_vm_readv_not_supported = 1;
 #endif /* end of hack */
 
 static ssize_t
-vm_read_mem(pid_t pid, void *laddr, long raddr, size_t len)
+vm_read_mem(const pid_t pid, void *const laddr,
+           const kernel_ureg_t raddr, const size_t len)
 {
        const struct iovec local = {
                .iov_base = laddr,
@@ -1101,7 +1099,8 @@ vm_read_mem(pid_t pid, void *laddr, long raddr, size_t len)
  * at address `addr' to our space at `our_addr'
  */
 int
-umoven(struct tcb *tcp, long addr, unsigned int len, void *our_addr)
+umoven(struct tcb *const tcp, kernel_ureg_t addr, unsigned int len,
+       void *const our_addr)
 {
        char *laddr = our_addr;
        int pid = tcp->pid;
@@ -1208,8 +1207,8 @@ umoven(struct tcb *tcp, long addr, unsigned int len, void *our_addr)
 }
 
 int
-umoven_or_printaddr(struct tcb *tcp, const long addr, const unsigned int len,
-                   void *our_addr)
+umoven_or_printaddr(struct tcb *const tcp, const kernel_ureg_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) {
@@ -1220,8 +1219,10 @@ umoven_or_printaddr(struct tcb *tcp, const long addr, const unsigned int len,
 }
 
 int
-umoven_or_printaddr_ignore_syserror(struct tcb *tcp, const long addr,
-                                   const unsigned int len, void *our_addr)
+umoven_or_printaddr_ignore_syserror(struct tcb *const tcp,
+                                   const kernel_ureg_t addr,
+                                   const unsigned int len,
+                                   void *const our_addr)
 {
        if (!addr || !verbose(tcp) || umoven(tcp, addr, len, our_addr) < 0) {
                printaddr(addr);
@@ -1243,7 +1244,7 @@ umoven_or_printaddr_ignore_syserror(struct tcb *tcp, const long addr,
  * we never write past laddr[len-1]).
  */
 int
-umovestr(struct tcb *tcp, long addr, unsigned int len, char *laddr)
+umovestr(struct tcb *const tcp, kernel_ureg_t addr, unsigned int len, char *laddr)
 {
        const unsigned long x01010101 = (unsigned long) 0x0101010101010101ULL;
        const unsigned long x80808080 = (unsigned long) 0x8080808080808080ULL;
@@ -1420,13 +1421,13 @@ umovestr(struct tcb *tcp, long addr, unsigned int len, char *laddr)
  * - umoven_func has not returned false.
  */
 bool
-print_array(struct tcb *tcp,
-           const unsigned long start_addr,
+print_array(struct tcb *const tcp,
+           const kernel_ureg_t start_addr,
            const size_t nmemb,
            void *const elem_buf,
            const size_t elem_size,
            int (*const umoven_func)(struct tcb *,
-                                    long,
+                                    kernel_ureg_t,
                                     unsigned int,
                                     void *),
            bool (*const print_func)(struct tcb *,
@@ -1446,17 +1447,17 @@ print_array(struct tcb *tcp,
        }
 
        const size_t size = nmemb * elem_size;
-       const unsigned long end_addr = start_addr + size;
+       const kernel_ureg_t end_addr = start_addr + size;
 
        if (end_addr <= start_addr || size / elem_size != nmemb) {
                printaddr(start_addr);
                return false;
        }
 
-       const unsigned long abbrev_end =
+       const kernel_ureg_t abbrev_end =
                (abbrev(tcp) && max_strlen < nmemb) ?
                        start_addr + elem_size * max_strlen : end_addr;
-       unsigned long cur;
+       kernel_ureg_t cur;
 
        for (cur = start_addr; cur < end_addr; cur += elem_size) {
                if (cur != start_addr)