]> granicus.if.org Git - strace/blobdiff - io.c
Change last parameter of umoven() from char* to void*
[strace] / io.c
diff --git a/io.c b/io.c
index e42fba111949296b3ed0846a3a47d145cc51d73f..06185096219b736101350b082fc684c4faca51a1 100644 (file)
--- a/io.c
+++ b/io.c
@@ -2,6 +2,7 @@
  * 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
  * 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"
-
 #include <fcntl.h>
 #include <sys/uio.h>
 
 int
-sys_read(tcp)
-struct tcb *tcp;
+sys_read(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
        } else {
                if (syserror(tcp))
                        tprintf("%#lx", tcp->u_arg[1]);
@@ -51,209 +49,380 @@ struct tcb *tcp;
 }
 
 int
-sys_write(tcp)
-struct tcb *tcp;
+sys_write(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
                tprintf(", %lu", tcp->u_arg[2]);
        }
        return 0;
 }
 
-int
-sys_readv(tcp)
-struct tcb *tcp;
+/*
+ * data_size limits the cumulative size of printed data.
+ * Example: recvmsg returing a short read.
+ */
+void
+tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov, unsigned long data_size)
+{
+#if SUPPORTED_PERSONALITIES > 1
+       union {
+               struct { u_int32_t base; u_int32_t len; } iov32;
+               struct { u_int64_t base; u_int64_t len; } iov64;
+       } iov;
+#define sizeof_iov \
+       (current_wordsize == 4 ? sizeof(iov.iov32) : sizeof(iov.iov64))
+#define iov_iov_base \
+       (current_wordsize == 4 ? (uint64_t) iov.iov32.base : iov.iov64.base)
+#define iov_iov_len \
+       (current_wordsize == 4 ? (uint64_t) iov.iov32.len : iov.iov64.len)
+#else
+       struct iovec iov;
+#define sizeof_iov sizeof(iov)
+#define iov_iov_base iov.iov_base
+#define iov_iov_len iov.iov_len
+#endif
+       unsigned long size, cur, end, abbrev_end;
+       int failed = 0;
+
+       if (!len) {
+               tprints("[]");
+               return;
+       }
+       size = len * sizeof_iov;
+       end = addr + size;
+       if (!verbose(tcp) || size / sizeof_iov != len || end < addr) {
+               tprintf("%#lx", addr);
+               return;
+       }
+       if (abbrev(tcp)) {
+               abbrev_end = addr + max_strlen * sizeof_iov;
+               if (abbrev_end < addr)
+                       abbrev_end = end;
+       } else {
+               abbrev_end = end;
+       }
+       tprints("[");
+       for (cur = addr; cur < end; cur += sizeof_iov) {
+               if (cur > addr)
+                       tprints(", ");
+               if (cur >= abbrev_end) {
+                       tprints("...");
+                       break;
+               }
+               if (umoven(tcp, cur, sizeof_iov, &iov) < 0) {
+                       tprints("?");
+                       failed = 1;
+                       break;
+               }
+               tprints("{");
+               if (decode_iov) {
+                       unsigned long len = iov_iov_len;
+                       if (len > data_size)
+                               len = data_size;
+                       data_size -= len;
+                       printstr(tcp, (long) iov_iov_base, len);
+               } else
+                       tprintf("%#lx", (long) iov_iov_base);
+               tprintf(", %lu}", (unsigned long)iov_iov_len);
+       }
+       tprints("]");
+       if (failed)
+               tprintf(" %#lx", addr);
+#undef sizeof_iov
+#undef iov_iov_base
+#undef iov_iov_len
+}
+
+void
+tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov)
 {
-       struct iovec *iov;
-       int i, len;
+       tprint_iov_upto(tcp, len, addr, decode_iov, (unsigned long) -1L);
+}
 
+int
+sys_readv(struct tcb *tcp)
+{
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
        } else {
                if (syserror(tcp)) {
                        tprintf("%#lx, %lu",
                                        tcp->u_arg[1], tcp->u_arg[2]);
                        return 0;
                }
-               len = tcp->u_arg[2];
-               if ((iov = (struct iovec *) malloc(len * sizeof *iov)) == NULL) {
-                       fprintf(stderr, "No memory");
-                       return 0;
-               }
-               if (umoven(tcp, tcp->u_arg[1],
-                               len * sizeof *iov, (char *) iov) < 0) {
-                       tprintf("%#lx", tcp->u_arg[1]);
-               } else {
-                       tprintf("[");
-                       for (i = 0; i < len; i++) {
-                               if (i)
-                                       tprintf(", ");
-                               tprintf("{");
-                               printstr(tcp, (long) iov[i].iov_base,
-                                       iov[i].iov_len);
-                               tprintf(", %lu}", (unsigned long)iov[i].iov_len);
-                       }
-                       tprintf("]");
-               }
-               free((char *) iov);
+               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
                tprintf(", %lu", tcp->u_arg[2]);
        }
        return 0;
 }
 
 int
-sys_writev(tcp)
-struct tcb *tcp;
+sys_writev(struct tcb *tcp)
 {
-       struct iovec *iov;
-       int i, len;
-
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               len = tcp->u_arg[2];
-               iov = (struct iovec *) malloc(len * sizeof *iov);
-               if (iov == NULL) {
-                       fprintf(stderr, "No memory");
-                       return 0;
-               }
-               if (umoven(tcp, tcp->u_arg[1],
-                               len * sizeof *iov, (char *) iov) < 0) {
-                       tprintf("%#lx", tcp->u_arg[1]);
-               } else {
-                       tprintf("[");
-                       for (i = 0; i < len; i++) {
-                               if (i)
-                                       tprintf(", ");
-                               tprintf("{");
-                               printstr(tcp, (long) iov[i].iov_base,
-                                       iov[i].iov_len);
-                               tprintf(", %lu}", (unsigned long)iov[i].iov_len);
-                       }
-                       tprintf("]");
-               }
-               free((char *) iov);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
                tprintf(", %lu", tcp->u_arg[2]);
        }
        return 0;
 }
 
-#ifdef SVR4
+/* The SH4 ABI does allow long longs in odd-numbered registers, but
+   does not allow them to be split between registers and memory - and
+   there are only four argument registers for normal functions.  As a
+   result pread takes an extra padding argument before the offset.  This
+   was changed late in the 2.4 series (around 2.4.20).  */
+#if defined(SH)
+#define PREAD_OFFSET_ARG 4
+#else
+#define PREAD_OFFSET_ARG 3
+#endif
 
 int
-sys_pread(tcp)
-struct tcb *tcp;
+sys_pread(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
        } else {
                if (syserror(tcp))
                        tprintf("%#lx", tcp->u_arg[1]);
                else
                        printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-#if UNIXWARE
-               /* off_t is signed int */
-               tprintf(", %lu, %ld", tcp->u_arg[2], tcp->u_arg[3]);
-#else
-               tprintf(", %lu, %llu", tcp->u_arg[2],
-                               (((unsigned long long) tcp->u_arg[4]) << 32
-                                | tcp->u_arg[3]));
-#endif
+               tprintf(", %lu, ", tcp->u_arg[2]);
+               printllval(tcp, "%llu", PREAD_OFFSET_ARG);
        }
        return 0;
 }
 
 int
-sys_pwrite(tcp)
-struct tcb *tcp;
+sys_pwrite(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-#if UNIXWARE
-               /* off_t is signed int */
-               tprintf(", %lu, %ld", tcp->u_arg[2], tcp->u_arg[3]);
+               tprintf(", %lu, ", tcp->u_arg[2]);
+               printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+       }
+       return 0;
+}
+
+static void
+print_llu_from_low_high_val(struct tcb *tcp, int arg)
+{
+#if SIZEOF_LONG == SIZEOF_LONG_LONG
+# if SUPPORTED_PERSONALITIES > 1
+       if (current_wordsize == sizeof(long))
+# endif
+               tprintf("%lu", (unsigned long) tcp->u_arg[arg]);
+# if SUPPORTED_PERSONALITIES > 1
+       else
+               tprintf("%lu",
+                       ((unsigned long) tcp->u_arg[arg + 1] << current_wordsize * 8)
+                       | (unsigned long) tcp->u_arg[arg]);
+# endif
 #else
-               tprintf(", %lu, %llu", tcp->u_arg[2],
-                               (((unsigned long long) tcp->u_arg[4]) << 32
-                                | tcp->u_arg[3]));
+# ifdef X32
+       if (current_personality == 0)
+               tprintf("%llu", (unsigned long long) tcp->ext_arg[arg]);
+       else
+# endif
+       tprintf("%llu",
+               ((unsigned long long) (unsigned long) tcp->u_arg[arg + 1] << sizeof(long) * 8)
+               | (unsigned long long) (unsigned long) tcp->u_arg[arg]);
 #endif
+}
+
+int
+sys_preadv(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+       } else {
+               if (syserror(tcp)) {
+                       tprintf("%#lx, %lu", tcp->u_arg[1], tcp->u_arg[2]);
+                       return 0;
+               }
+               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+               tprintf(", %lu, ", tcp->u_arg[2]);
+               print_llu_from_low_high_val(tcp, 3);
        }
        return 0;
 }
-#endif /* SVR4 */
 
-#ifdef LINUX
 int
-sys_pread(tcp)
-struct tcb *tcp;
+sys_pwritev(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-       } else {
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+               tprintf(", %lu, ", tcp->u_arg[2]);
+               print_llu_from_low_high_val(tcp, 3);
+       }
+       return 0;
+}
+
+static void
+print_off_t(struct tcb *tcp, long addr)
+{
+       unsigned long offset;
+
+       if (!addr) {
+               tprints("NULL");
+               return;
+       }
+
+#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
+       if (current_wordsize == 4) {
+               uint32_t off;
+
+               if (umove(tcp, addr, &off) < 0)
+                       tprintf("%#lx", addr);
                else
-                       printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-               tprintf(", %lu, %llu", tcp->u_arg[2],
-                       *(unsigned long long *)&tcp->u_arg[3]);
+                       tprintf("[%u]", off);
+       } else
+#endif
+       if (umove(tcp, addr, &offset) < 0)
+               tprintf("%#lx", addr);
+       else
+               tprintf("[%lu]", offset);
+}
+
+int
+sys_sendfile(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               printfd(tcp, tcp->u_arg[1]);
+               tprints(", ");
+               print_off_t(tcp, tcp->u_arg[2]);
+               tprintf(", %lu", tcp->u_arg[3]);
        }
        return 0;
 }
 
+void
+print_loff_t(struct tcb *tcp, long addr)
+{
+       loff_t offset;
+
+       if (!addr)
+               tprints("NULL");
+       else if (umove(tcp, addr, &offset) < 0)
+               tprintf("%#lx", addr);
+       else
+               tprintf("[%llu]", (unsigned long long int) offset);
+}
+
 int
-sys_pwrite(tcp)
-struct tcb *tcp;
+sys_sendfile64(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, %llu", tcp->u_arg[2],
-                       *(unsigned long long *)&tcp->u_arg[3]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               printfd(tcp, tcp->u_arg[1]);
+               tprints(", ");
+               print_loff_t(tcp, tcp->u_arg[2]);
+               tprintf(", %lu", tcp->u_arg[3]);
        }
        return 0;
 }
 
+#include "xlat/splice_flags.h"
+
 int
-sys_sendfile(tcp)
-struct tcb *tcp;
+sys_tee(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               off_t offset;
+               /* int fd_in */
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               /* int fd_out */
+               printfd(tcp, tcp->u_arg[1]);
+               tprints(", ");
+               /* size_t len */
+               tprintf("%lu, ", tcp->u_arg[2]);
+               /* unsigned int flags */
+               printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
+       }
+       return 0;
+}
 
-               tprintf("%ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1]);
-               if (!tcp->u_arg[2])
-                       tprintf("NULL");
-               else if (umove(tcp, tcp->u_arg[2], &offset) < 0)
-                       tprintf("%#lx", tcp->u_arg[2]);
-               else
-                       tprintf("[%lu]", offset);
-               tprintf(", %lu", tcp->u_arg[3]);
+int
+sys_splice(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               /* int fd_in */
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               /* loff_t *off_in */
+               print_loff_t(tcp, tcp->u_arg[1]);
+               tprints(", ");
+               /* int fd_out */
+               printfd(tcp, tcp->u_arg[2]);
+               tprints(", ");
+               /* loff_t *off_out */
+               print_loff_t(tcp, tcp->u_arg[3]);
+               tprints(", ");
+               /* size_t len */
+               tprintf("%lu, ", tcp->u_arg[4]);
+               /* unsigned int flags */
+               printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
        }
        return 0;
 }
 
-#endif /* LINUX */
+int
+sys_vmsplice(struct tcb *tcp)
+{
+       if (entering(tcp)) {
+               /* int fd */
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               /* const struct iovec *iov, unsigned long nr_segs */
+               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+               tprintf(", %lu, ", tcp->u_arg[2]);
+               /* unsigned int flags */
+               printflags(splice_flags, tcp->u_arg[3], "SPLICE_F_???");
+       }
+       return 0;
+}
 
 int
-sys_ioctl(tcp)
-struct tcb *tcp;
+sys_ioctl(struct tcb *tcp)
 {
-       char *symbol;
+       const struct_ioctlent *iop;
 
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               symbol = ioctl_lookup(tcp->u_arg[1]);
-               if (symbol)
-                       tprintf("%s", symbol);
-               else
-                       tprintf("%#lx", tcp->u_arg[1]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               if (!ioctl_decode_command_number(tcp->u_arg[1])) {
+                       iop = ioctl_lookup(tcp->u_arg[1]);
+                       if (iop) {
+                               tprints(iop->symbol);
+                               while ((iop = ioctl_next_match(iop)))
+                                       tprintf(" or %s", iop->symbol);
+                       } else {
+                               ioctl_print_code(tcp->u_arg[1]);
+                       }
+               }
                ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]);
        }
        else {
-               if (ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]) == 0)
+               int ret = ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+               if (!ret)
                        tprintf(", %#lx", tcp->u_arg[2]);
+               else
+                       return ret - 1;
        }
        return 0;
 }