]> granicus.if.org Git - strace/blobdiff - io.c
getdents: fix typos in array output
[strace] / io.c
diff --git a/io.c b/io.c
index 65b48fdb96541e24d4c03b03ee1d3a604eea01f1..0cdc469fc30b1ca5018cde7422a13c54477efc5f 100644 (file)
--- a/io.c
+++ b/io.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"
-
 #include <fcntl.h>
-#if HAVE_SYS_UIO_H
 #include <sys/uio.h>
-#endif
-
-#ifdef HAVE_LONG_LONG_OFF_T
-/*
- * Hacks for systems that have a long long off_t
- */
 
-#define sys_pread64    sys_pread
-#define sys_pwrite64   sys_pwrite
-#endif
-
-int
-sys_read(tcp)
-struct tcb *tcp;
+SYS_FUNC(read)
 {
        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]);
+                       printaddr(tcp->u_arg[1]);
                else
                        printstr(tcp, tcp->u_arg[1], tcp->u_rval);
                tprintf(", %lu", tcp->u_arg[2]);
@@ -62,175 +47,97 @@ struct tcb *tcp;
        return 0;
 }
 
-int
-sys_write(tcp)
-struct tcb *tcp;
+SYS_FUNC(write)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 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 RVAL_DECODED;
 }
 
-#if HAVE_SYS_UIO_H
+/*
+ * data_size limits the cumulative size of printed data.
+ * Example: recvmsg returing a short read.
+ */
 void
-tprint_iov(tcp, len, addr)
-struct tcb * tcp;
-int len;
-long addr;
+tprint_iov_upto(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov, unsigned long data_size)
 {
-       struct iovec *iov;
-       int i;
-
+       unsigned long iov[2];
+       unsigned long size, cur, end, abbrev_end;
+       const unsigned long sizeof_iov = current_wordsize * 2;
 
        if (!len) {
-               tprintf("[]");
+               tprints("[]");
                return;
        }
-
-       if ((iov = (struct iovec *) malloc(len * sizeof *iov)) == NULL) {
-               fprintf(stderr, "No memory");
+       size = len * sizeof_iov;
+       end = addr + size;
+       if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)) ||
+           !addr || size / sizeof_iov != len || end < addr) {
+               printaddr(addr);
                return;
        }
-       if (umoven(tcp, addr,
-                  len * sizeof *iov, (char *) iov) < 0) {
-               tprintf("%#lx", tcp->u_arg[1]);
+       if (abbrev(tcp)) {
+               abbrev_end = addr + max_strlen * sizeof_iov;
+               if (abbrev_end < addr)
+                       abbrev_end = end;
        } 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("]");
+               abbrev_end = end;
        }
-       free((char *) iov);
-}
-
-int
-sys_readv(tcp)
-struct tcb *tcp;
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-       } else {
-               if (syserror(tcp)) {
-                       tprintf("%#lx, %lu",
-                                       tcp->u_arg[1], tcp->u_arg[2]);
-                       return 0;
+       tprints("[");
+       for (cur = addr; cur < end; cur += sizeof_iov) {
+               if (cur > addr)
+                       tprints(", ");
+               if (cur >= abbrev_end) {
+                       tprints("...");
+                       break;
                }
-               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
-               tprintf(", %lu", tcp->u_arg[2]);
+               if (umove_ulong_array_or_printaddr(tcp, cur, iov,
+                                                  ARRAY_SIZE(iov)))
+                       break;
+               tprints("{");
+               if (decode_iov) {
+                       unsigned long len = iov[1];
+                       if (len > data_size)
+                               len = data_size;
+                       data_size -= len;
+                       printstr(tcp, iov[0], len);
+               } else
+                       printaddr(iov[0]);
+               tprintf(", %lu}", iov[1]);
        }
-       return 0;
+       tprints("]");
 }
 
-int
-sys_writev(tcp)
-struct tcb *tcp;
+void
+tprint_iov(struct tcb *tcp, unsigned long len, unsigned long addr, int decode_iov)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1]);
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
+       tprint_iov_upto(tcp, len, addr, decode_iov, (unsigned long) -1L);
 }
-#endif
-
-#if defined(SVR4)
 
-int
-sys_pread(tcp)
-struct tcb *tcp;
+SYS_FUNC(readv)
 {
        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
-                                | (unsigned) tcp->u_arg[3]));
-#endif
-       }
-       return 0;
-}
-
-int
-sys_pwrite(tcp)
-struct tcb *tcp;
-{
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               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]);
-#else
-               tprintf(", %lu, %llu", tcp->u_arg[2],
-                               (((unsigned long long) tcp->u_arg[4]) << 32
-                                | (unsigned) tcp->u_arg[3]));
-#endif
+               tprint_iov(tcp, tcp->u_arg[2], tcp->u_arg[1], 1);
+               tprintf(", %lu", tcp->u_arg[2]);
        }
        return 0;
 }
-#endif /* SVR4 */
-
-#ifdef FREEBSD
-#include <sys/types.h>
-#include <sys/socket.h>
 
-int
-sys_sendfile(tcp)
-struct tcb *tcp;
+SYS_FUNC(writev)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, %ld, %llu, %lu", tcp->u_arg[0], tcp->u_arg[1],
-                       (((unsigned long long) tcp->u_arg[3]) << 32 |
-                        (unsigned) tcp->u_arg[2]), tcp->u_arg[4]);
-       } else {
-               off_t offset;
-
-               if (!tcp->u_arg[5])
-                       tprintf(", NULL");
-               else {
-                       struct sf_hdtr hdtr;
+       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]);
 
-                       if (umove(tcp, tcp->u_arg[5], &hdtr) < 0)
-                               tprintf(", %#lx", tcp->u_arg[5]);
-                       else {
-                               tprintf(", { ");
-                               tprint_iov(tcp, hdtr.hdr_cnt, hdtr.headers);
-                               tprintf(", %u, ", hdtr.hdr_cnt);
-                               tprint_iov(tcp, hdtr.trl_cnt, hdtr.trailers);
-                               tprintf(", %u }", hdtr.hdr_cnt);
-                       }
-               }
-               if (!tcp->u_arg[6])
-                       tprintf(", NULL");
-               else if (umove(tcp, tcp->u_arg[6], &offset) < 0)
-                       tprintf(", %#lx", tcp->u_arg[6]);
-               else
-                       tprintf(", [%llu]", offset);
-               tprintf(", %lu", tcp->u_arg[7]);
-       }
-       return 0;
+       return RVAL_DECODED;
 }
-#endif /* FREEBSD */
-
-#ifdef LINUX
 
 /* The SH4 ABI does allow long longs in odd-numbered registers, but
    does not allow them to be split between registers and memory - and
@@ -243,133 +150,133 @@ struct tcb *tcp;
 #define PREAD_OFFSET_ARG 3
 #endif
 
-int
-sys_pread(tcp)
-struct tcb *tcp;
+SYS_FUNC(pread)
 {
        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]);
+                       printaddr(tcp->u_arg[1]);
                else
                        printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-               ALIGN64 (tcp, PREAD_OFFSET_ARG); /* PowerPC alignment restriction */
-               tprintf(", %lu, %llu", tcp->u_arg[2],
-                       *(unsigned long long *)&tcp->u_arg[PREAD_OFFSET_ARG]);
+               tprintf(", %lu, ", tcp->u_arg[2]);
+               printllval(tcp, "%llu", PREAD_OFFSET_ARG);
        }
        return 0;
 }
 
-int
-sys_pwrite(tcp)
-struct tcb *tcp;
+SYS_FUNC(pwrite)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               ALIGN64 (tcp, PREAD_OFFSET_ARG); /* PowerPC alignment restriction */
-               tprintf(", %lu, %llu", tcp->u_arg[2],
-                       *(unsigned long long *)&tcp->u_arg[PREAD_OFFSET_ARG]);
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
+       tprintf(", %lu, ", tcp->u_arg[2]);
+       printllval(tcp, "%llu", PREAD_OFFSET_ARG);
+
+       return RVAL_DECODED;
 }
 
-int
-sys_sendfile(tcp)
-struct tcb *tcp;
+static void
+print_llu_from_low_high_val(struct tcb *tcp, int arg)
 {
-       if (entering(tcp)) {
-               off_t offset;
+#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
+# 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
+}
 
-               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]);
+SYS_FUNC(preadv)
+{
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+       } else {
+               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;
 }
 
-int
-sys_sendfile64(tcp)
-struct tcb *tcp;
+SYS_FUNC(pwritev)
 {
-       if (entering(tcp)) {
-               loff_t offset;
+       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);
 
-               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("[%llu]", (unsigned long long int) offset);
-               tprintf(", %lu", tcp->u_arg[3]);
-       }
-       return 0;
+       return RVAL_DECODED;
 }
 
-#endif /* LINUX */
+#include "xlat/splice_flags.h"
 
-#if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
-int
-sys_pread64(tcp)
-struct tcb *tcp;
+SYS_FUNC(tee)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-       } else {
-               ALIGN64 (tcp, 3);
-               if (syserror(tcp))
-                       tprintf("%#lx", tcp->u_arg[1]);
-               else
-                       printstr(tcp, tcp->u_arg[1], tcp->u_rval);
-               tprintf(", %lu, %#llx", tcp->u_arg[2],
-                       LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
-       }
-       return 0;
+       /* 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 RVAL_DECODED;
 }
 
-int
-sys_pwrite64(tcp)
-struct tcb *tcp;
+SYS_FUNC(splice)
 {
-       if (entering(tcp)) {
-               ALIGN64 (tcp, 3);
-               tprintf("%ld, ", tcp->u_arg[0]);
-               printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-               tprintf(", %lu, %#llx", tcp->u_arg[2],
-                       LONG_LONG(tcp->u_arg[3], tcp->u_arg[4]));
-       }
-       return 0;
+       /* int fd_in */
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       /* loff_t *off_in */
+       printnum_int64(tcp, tcp->u_arg[1], "%" PRIu64);
+       tprints(", ");
+       /* int fd_out */
+       printfd(tcp, tcp->u_arg[2]);
+       tprints(", ");
+       /* loff_t *off_out */
+       printnum_int64(tcp, tcp->u_arg[3], "%" PRIu64);
+       tprints(", ");
+       /* size_t len */
+       tprintf("%lu, ", tcp->u_arg[4]);
+       /* unsigned int flags */
+       printflags(splice_flags, tcp->u_arg[5], "SPLICE_F_???");
+
+       return RVAL_DECODED;
 }
-#endif
 
-int
-sys_ioctl(tcp)
-struct tcb *tcp;
+SYS_FUNC(vmsplice)
 {
-       char *symbol;
-
-       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]);
-               ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2]);
-       }
-       else {
-               int ret;
-               if (!(ret = ioctl_decode(tcp, tcp->u_arg[1], tcp->u_arg[2])))
-                       tprintf(", %#lx", tcp->u_arg[2]);
-               else
-                       return ret - 1;
-       }
-       return 0;
+       /* 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 RVAL_DECODED;
 }