]> granicus.if.org Git - strace/blobdiff - desc.c
travis: add build environment information to the travis log
[strace] / desc.c
diff --git a/desc.c b/desc.c
index 053a3d0fed25c54e5efe20b92c9a806d17b5da35..52e58c86e95610952d3bdc554078e30e8b9ebadf 100644 (file)
--- a/desc.c
+++ b/desc.c
@@ -3,6 +3,7 @@
  * 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>
+ * Copyright (c) 1999-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  */
 
 #include "defs.h"
-#include <fcntl.h>
-#include <sys/file.h>
-#ifdef HAVE_SYS_EPOLL_H
-# include <sys/epoll.h>
-#endif
-#ifdef HAVE_LINUX_PERF_EVENT_H
-# include  <linux/perf_event.h>
-#endif
-
-/* --- Copied from libaio-0.3.109/src/libaio.h ---
- * Why keep a copy instead of using external libaio.h?
- * Because we want to properly decode 32-bit aio calls
- * by 64-bit strace. For that, we need more definitions than
- * libaio.h provides. (TODO).
- * Keeping our local 32-bit compat defs in sync with libaio.h
- * _without seeing libaio structs_ is hard/more bug-prone.
- * A smaller benefit is that we don't need libaio installed.
- */
-#define HAVE_LIBAIO_H 1
-typedef enum io_iocb_cmd {
-       IO_CMD_PREAD = 0,
-       IO_CMD_PWRITE = 1,
-
-       IO_CMD_FSYNC = 2,
-       IO_CMD_FDSYNC = 3,
-
-       IO_CMD_POLL = 5, /* Never implemented in mainline, see io_prep_poll */
-       IO_CMD_NOOP = 6,
-       IO_CMD_PREADV = 7,
-       IO_CMD_PWRITEV = 8,
-} io_iocb_cmd_t;
-
-#if defined(__i386__) /* little endian, 32 bits */
-#define PADDED(x, y)   x; unsigned y
-#define PADDEDptr(x, y)        x; unsigned y
-#define PADDEDul(x, y) unsigned long x; unsigned y
-#elif defined(__ia64__) || defined(__x86_64__) || defined(__alpha__)
-#define PADDED(x, y)   x, y
-#define PADDEDptr(x, y)        x
-#define PADDEDul(x, y) unsigned long x
-#elif defined(__powerpc64__) /* big endian, 64 bits */
-#define PADDED(x, y)   unsigned y; x
-#define PADDEDptr(x,y) x
-#define PADDEDul(x, y) unsigned long x
-#elif defined(__PPC__)  /* big endian, 32 bits */
-#define PADDED(x, y)   unsigned y; x
-#define PADDEDptr(x, y)        unsigned y; x
-#define PADDEDul(x, y) unsigned y; unsigned long x
-#elif defined(__s390x__) /* big endian, 64 bits */
-#define PADDED(x, y)   unsigned y; x
-#define PADDEDptr(x,y) x
-#define PADDEDul(x, y) unsigned long x
-#elif defined(__s390__) /* big endian, 32 bits */
-#define PADDED(x, y)   unsigned y; x
-#define PADDEDptr(x, y) unsigned y; x
-#define PADDEDul(x, y) unsigned y; unsigned long x
-#elif defined(__arm__)
-#  if defined (__ARMEB__) /* big endian, 32 bits */
-#define PADDED(x, y)   unsigned y; x
-#define PADDEDptr(x, y)        unsigned y; x
-#define PADDEDul(x, y) unsigned y; unsigned long x
-#  else                   /* little endian, 32 bits */
-#define PADDED(x, y)   x; unsigned y
-#define PADDEDptr(x, y)        x; unsigned y
-#define PADDEDul(x, y) unsigned long x; unsigned y
-#  endif
-#else
-#  warning No AIO definitions for this architecture => no io_submit decoding
-#  undef HAVE_LIBAIO_H
-#endif
-
-#ifdef HAVE_LIBAIO_H
-struct io_iocb_poll {
-       PADDED(int events, __pad1);
-};     /* result code is the set of result flags or -'ve errno */
-
-struct io_iocb_sockaddr {
-       struct sockaddr *addr;
-       int             len;
-};     /* result code is the length of the sockaddr, or -'ve errno */
-
-struct io_iocb_common {
-       PADDEDptr(void  *buf, __pad1);
-       PADDEDul(nbytes, __pad2);
-       long long       offset;
-       long long       __pad3;
-       unsigned        flags;
-       unsigned        resfd;
-};     /* result code is the amount read or -'ve errno */
-
-struct io_iocb_vector {
-       const struct iovec      *vec;
-       int                     nr;
-       long long               offset;
-};     /* result code is the amount read or -'ve errno */
-
-struct iocb {
-       PADDEDptr(void *data, __pad1);  /* Return in the io completion event */
-       PADDED(unsigned key, __pad2);   /* For use in identifying io requests */
-
-       short           aio_lio_opcode;
-       short           aio_reqprio;
-       int             aio_fildes;
-
-       union {
-               struct io_iocb_common           c;
-               struct io_iocb_vector           v;
-               struct io_iocb_poll             poll;
-               struct io_iocb_sockaddr saddr;
-       } u;
-};
-
-struct io_event {
-       PADDEDptr(void *data, __pad1);
-       PADDEDptr(struct iocb *obj,  __pad2);
-       PADDEDul(res,  __pad3);
-       PADDEDul(res2, __pad4);
-};
-
-#undef PADDED
-#undef PADDEDptr
-#undef PADDEDul
-
-#endif /* HAVE_LIBAIO_H */
-
-/* --- End of a chunk of libaio.h --- */
-/* Not defined in libaio.h */
-#ifndef IOCB_RESFD
-# define IOCB_RESFD (1 << 0)
-#endif
-
-
-static const struct xlat fcntlcmds[] = {
-       { F_DUPFD,      "F_DUPFD"       },
-       { F_GETFD,      "F_GETFD"       },
-       { F_SETFD,      "F_SETFD"       },
-       { F_GETFL,      "F_GETFL"       },
-       { F_SETFL,      "F_SETFL"       },
-       { F_GETLK,      "F_GETLK"       },
-       { F_SETLK,      "F_SETLK"       },
-       { F_SETLKW,     "F_SETLKW"      },
-       { F_GETOWN,     "F_GETOWN"      },
-       { F_SETOWN,     "F_SETOWN"      },
-#ifdef F_RSETLK
-       { F_RSETLK,     "F_RSETLK"      },
-#endif
-#ifdef F_RSETLKW
-       { F_RSETLKW,    "F_RSETLKW"     },
-#endif
-#ifdef F_RGETLK
-       { F_RGETLK,     "F_RGETLK"      },
-#endif
-#ifdef F_CNVT
-       { F_CNVT,       "F_CNVT"        },
-#endif
-#ifdef F_SETSIG
-       { F_SETSIG,     "F_SETSIG"      },
-#endif
-#ifdef F_GETSIG
-       { F_GETSIG,     "F_GETSIG"      },
-#endif
-#ifdef F_CHKFL
-       { F_CHKFL,      "F_CHKFL"       },
-#endif
-#ifdef F_DUP2FD
-       { F_DUP2FD,     "F_DUP2FD"      },
-#endif
-#ifdef F_ALLOCSP
-       { F_ALLOCSP,    "F_ALLOCSP"     },
-#endif
-#ifdef F_ISSTREAM
-       { F_ISSTREAM,   "F_ISSTREAM"    },
-#endif
-#ifdef F_PRIV
-       { F_PRIV,       "F_PRIV"        },
-#endif
-#ifdef F_NPRIV
-       { F_NPRIV,      "F_NPRIV"       },
-#endif
-#ifdef F_QUOTACL
-       { F_QUOTACL,    "F_QUOTACL"     },
-#endif
-#ifdef F_BLOCKS
-       { F_BLOCKS,     "F_BLOCKS"      },
-#endif
-#ifdef F_BLKSIZE
-       { F_BLKSIZE,    "F_BLKSIZE"     },
-#endif
-#ifdef F_GETOWN
-       { F_GETOWN,     "F_GETOWN"      },
-#endif
-#ifdef F_SETOWN
-       { F_SETOWN,     "F_SETOWN"      },
-#endif
-#ifdef F_REVOKE
-       { F_REVOKE,     "F_REVOKE"      },
-#endif
-#ifdef F_SETLK
-       { F_SETLK,      "F_SETLK"       },
-#endif
-#ifdef F_SETLKW
-       { F_SETLKW,     "F_SETLKW"      },
-#endif
-#ifdef F_FREESP
-       { F_FREESP,     "F_FREESP"      },
-#endif
-#ifdef F_GETLK
-       { F_GETLK,      "F_GETLK"       },
-#endif
-#ifdef F_SETLK64
-       { F_SETLK64,    "F_SETLK64"     },
-#endif
-#ifdef F_SETLKW64
-       { F_SETLKW64,   "F_SETLKW64"    },
-#endif
-#ifdef F_FREESP64
-       { F_FREESP64,   "F_FREESP64"    },
-#endif
-#ifdef F_GETLK64
-       { F_GETLK64,    "F_GETLK64"     },
-#endif
-#ifdef F_SHARE
-       { F_SHARE,      "F_SHARE"       },
-#endif
-#ifdef F_UNSHARE
-       { F_UNSHARE,    "F_UNSHARE"     },
-#endif
-#ifdef F_SETLEASE
-       { F_SETLEASE,   "F_SETLEASE"    },
-#endif
-#ifdef F_GETLEASE
-       { F_GETLEASE,   "F_GETLEASE"    },
-#endif
-#ifdef F_NOTIFY
-       { F_NOTIFY,     "F_NOTIFY"      },
-#endif
-#ifdef F_DUPFD_CLOEXEC
-       { F_DUPFD_CLOEXEC,"F_DUPFD_CLOEXEC"},
-#endif
-       { 0,            NULL            },
-};
-
-static const struct xlat fdflags[] = {
-#ifdef FD_CLOEXEC
-       { FD_CLOEXEC,   "FD_CLOEXEC"    },
-#endif
-       { 0,            NULL            },
-};
-
-#ifdef LOCK_SH
 
-static const struct xlat flockcmds[] = {
-       { LOCK_SH,      "LOCK_SH"       },
-       { LOCK_EX,      "LOCK_EX"       },
-       { LOCK_NB,      "LOCK_NB"       },
-       { LOCK_UN,      "LOCK_UN"       },
-       { 0,            NULL            },
-};
-
-#endif /* LOCK_SH */
-
-static const struct xlat lockfcmds[] = {
-       { F_RDLCK,      "F_RDLCK"       },
-       { F_WRLCK,      "F_WRLCK"       },
-       { F_UNLCK,      "F_UNLCK"       },
-#ifdef F_EXLCK
-       { F_EXLCK,      "F_EXLCK"       },
-#endif
-#ifdef F_SHLCK
-       { F_SHLCK,      "F_SHLCK"       },
-#endif
-       { 0,            NULL            },
-};
-
-#ifdef F_NOTIFY
-static const struct xlat notifyflags[] = {
-#ifdef DN_ACCESS
-       { DN_ACCESS,    "DN_ACCESS"     },
-#endif
-#ifdef DN_MODIFY
-       { DN_MODIFY,    "DN_MODIFY"     },
-#endif
-#ifdef DN_CREATE
-       { DN_CREATE,    "DN_CREATE"     },
-#endif
-#ifdef DN_DELETE
-       { DN_DELETE,    "DN_DELETE"     },
-#endif
-#ifdef DN_RENAME
-       { DN_RENAME,    "DN_RENAME"     },
-#endif
-#ifdef DN_ATTRIB
-       { DN_ATTRIB,    "DN_ATTRIB"     },
-#endif
-#ifdef DN_MULTISHOT
-       { DN_MULTISHOT, "DN_MULTISHOT"  },
-#endif
-       { 0,            NULL            },
-};
-#endif
-
-static const struct xlat perf_event_open_flags[] = {
-#ifdef PERF_FLAG_FD_NO_GROUP
-       { PERF_FLAG_FD_NO_GROUP,        "PERF_FLAG_FD_NO_GROUP" },
-#endif
-#ifdef PERF_FLAG_FD_OUTPUT
-       { PERF_FLAG_FD_OUTPUT,          "PERF_FLAG_FD_OUTPUT"   },
-#endif
-#ifdef PERF_FLAG_PID_CGROUP
-       { PERF_FLAG_PID_CGROUP,         "PERF_FLAG_PID_CGROUP"  },
-#endif
-       { 0,                            NULL                    },
-};
-
-#if _LFS64_LARGEFILE
-/* fcntl/lockf */
-static void
-printflock64(struct tcb *tcp, long addr, int getlk)
+SYS_FUNC(close)
 {
-       struct flock64 fl;
+       printfd(tcp, tcp->u_arg[0]);
 
-       if (umove(tcp, addr, &fl) < 0) {
-               tprints("{...}");
-               return;
-       }
-       tprints("{type=");
-       printxval(lockfcmds, fl.l_type, "F_???");
-       tprints(", whence=");
-       printxval(whence_codes, fl.l_whence, "SEEK_???");
-       tprintf(", start=%lld, len=%lld", (long long) fl.l_start, (long long) fl.l_len);
-       if (getlk)
-               tprintf(", pid=%lu}", (unsigned long) fl.l_pid);
-       else
-               tprints("}");
+       return RVAL_DECODED;
 }
-#endif
 
-/* fcntl/lockf */
-static void
-printflock(struct tcb *tcp, long addr, int getlk)
+SYS_FUNC(dup)
 {
-       struct flock fl;
+       printfd(tcp, tcp->u_arg[0]);
 
-#if SUPPORTED_PERSONALITIES > 1
-# ifdef X32
-       if (current_personality == 0) {
-               printflock64(tcp, addr, getlk);
-               return;
-       }
-# endif
-       if (current_wordsize != sizeof(fl.l_start)) {
-               if (current_wordsize == 4) {
-                       /* 32-bit x86 app on x86_64 and similar cases */
-                       struct {
-                               short int l_type;
-                               short int l_whence;
-                               int32_t l_start; /* off_t */
-                               int32_t l_len; /* off_t */
-                               int32_t l_pid; /* pid_t */
-                       } fl32;
-                       if (umove(tcp, addr, &fl32) < 0) {
-                               tprints("{...}");
-                               return;
-                       }
-                       fl.l_type = fl32.l_type;
-                       fl.l_whence = fl32.l_whence;
-                       fl.l_start = fl32.l_start;
-                       fl.l_len = fl32.l_len;
-                       fl.l_pid = fl32.l_pid;
-               } else {
-                       /* let people know we have a problem here */
-                       tprintf("<decode error: unsupported wordsize %d>",
-                               current_wordsize);
-                       return;
-               }
-       } else
-#endif
-       {
-               if (umove(tcp, addr, &fl) < 0) {
-                       tprints("{...}");
-                       return;
-               }
-       }
-       tprints("{type=");
-       printxval(lockfcmds, fl.l_type, "F_???");
-       tprints(", whence=");
-       printxval(whence_codes, fl.l_whence, "SEEK_???");
-#ifdef X32
-       tprintf(", start=%lld, len=%lld", fl.l_start, fl.l_len);
-#else
-       tprintf(", start=%ld, len=%ld", fl.l_start, fl.l_len);
-#endif
-       if (getlk)
-               tprintf(", pid=%lu}", (unsigned long) fl.l_pid);
-       else
-               tprints("}");
-}
-
-int
-sys_fcntl(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printxval(fcntlcmds, tcp->u_arg[1], "F_???");
-               switch (tcp->u_arg[1]) {
-               case F_SETFD:
-                       tprints(", ");
-                       printflags(fdflags, tcp->u_arg[2], "FD_???");
-                       break;
-               case F_SETOWN: case F_DUPFD:
-#ifdef F_DUPFD_CLOEXEC
-               case F_DUPFD_CLOEXEC:
-#endif
-                       tprintf(", %ld", tcp->u_arg[2]);
-                       break;
-               case F_SETFL:
-                       tprints(", ");
-                       tprint_open_modes(tcp->u_arg[2]);
-                       break;
-               case F_SETLK: case F_SETLKW:
-#ifdef F_FREESP
-               case F_FREESP:
-#endif
-                       tprints(", ");
-                       printflock(tcp, tcp->u_arg[2], 0);
-                       break;
-#if _LFS64_LARGEFILE
-#ifdef F_FREESP64
-               case F_FREESP64:
-#endif
-               /* Linux glibc defines SETLK64 as SETLK,
-                  even though the kernel has different values - as does Solaris. */
-#if defined(F_SETLK64) && F_SETLK64 + 0 != F_SETLK
-               case F_SETLK64:
-#endif
-#if defined(F_SETLKW64) && F_SETLKW64 + 0 != F_SETLKW
-               case F_SETLKW64:
-#endif
-                       tprints(", ");
-                       printflock64(tcp, tcp->u_arg[2], 0);
-                       break;
-#endif
-#ifdef F_NOTIFY
-               case F_NOTIFY:
-                       tprints(", ");
-                       printflags(notifyflags, tcp->u_arg[2], "DN_???");
-                       break;
-#endif
-#ifdef F_SETLEASE
-               case F_SETLEASE:
-                       tprints(", ");
-                       printxval(lockfcmds, tcp->u_arg[2], "F_???");
-                       break;
-#endif
-               }
-       }
-       else {
-               switch (tcp->u_arg[1]) {
-               case F_DUPFD:
-#ifdef F_DUPFD_CLOEXEC
-               case F_DUPFD_CLOEXEC:
-#endif
-               case F_SETFD: case F_SETFL:
-               case F_SETLK: case F_SETLKW:
-               case F_SETOWN: case F_GETOWN:
-#ifdef F_NOTIFY
-               case F_NOTIFY:
-#endif
-#ifdef F_SETLEASE
-               case F_SETLEASE:
-#endif
-                       break;
-               case F_GETFD:
-                       if (syserror(tcp) || tcp->u_rval == 0)
-                               return 0;
-                       tcp->auxstr = sprintflags("flags ", fdflags, tcp->u_rval);
-                       return RVAL_HEX|RVAL_STR;
-               case F_GETFL:
-                       if (syserror(tcp))
-                               return 0;
-                       tcp->auxstr = sprint_open_modes(tcp->u_rval);
-                       return RVAL_HEX|RVAL_STR;
-               case F_GETLK:
-                       tprints(", ");
-                       printflock(tcp, tcp->u_arg[2], 1);
-                       break;
-#if _LFS64_LARGEFILE
-#if defined(F_GETLK64) && F_GETLK64+0 != F_GETLK
-               case F_GETLK64:
-#endif
-                       tprints(", ");
-                       printflock64(tcp, tcp->u_arg[2], 1);
-                       break;
-#endif
-#ifdef F_GETLEASE
-               case F_GETLEASE:
-                       if (syserror(tcp))
-                               return 0;
-                       tcp->auxstr = xlookup(lockfcmds, tcp->u_rval);
-                       return RVAL_HEX|RVAL_STR;
-#endif
-               default:
-                       tprintf(", %#lx", tcp->u_arg[2]);
-                       break;
-               }
-       }
-       return 0;
-}
-
-#ifdef LOCK_SH
-
-int
-sys_flock(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printflags(flockcmds, tcp->u_arg[1], "LOCK_???");
-       }
-       return 0;
-}
-#endif /* LOCK_SH */
-
-int
-sys_close(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-       }
-       return 0;
+       return RVAL_DECODED | RVAL_FD;
 }
 
 static int
 do_dup2(struct tcb *tcp, int flags_arg)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printfd(tcp, tcp->u_arg[1]);
+       if (flags_arg >= 0) {
                tprints(", ");
-               printfd(tcp, tcp->u_arg[1]);
-               if (flags_arg >= 0) {
-                       tprints(", ");
-                       printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
-               }
+               printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
        }
-       return 0;
+
+       return RVAL_DECODED | RVAL_FD;
 }
 
-int
-sys_dup2(struct tcb *tcp)
+SYS_FUNC(dup2)
 {
        return do_dup2(tcp, -1);
 }
 
-int
-sys_dup3(struct tcb *tcp)
+SYS_FUNC(dup3)
 {
        return do_dup2(tcp, 2);
 }
 
-#if defined(ALPHA)
-int
-sys_getdtablesize(struct tcb *tcp)
-{
-       return 0;
-}
-#endif
-
 static int
-decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
+decode_select(struct tcb *const tcp, const kernel_ulong_t *const args,
+             void (*const print_tv_ts) (struct tcb *, kernel_ulong_t),
+             const char * (*const sprint_tv_ts) (struct tcb *, kernel_ulong_t))
 {
        int i, j;
        int nfds, fdsize;
-       fd_set *fds;
+       fd_set *fds = NULL;
        const char *sep;
-       long arg;
+       kernel_ulong_t addr;
 
-       /* Kernel truncates arg[0] to int, we do the same. */
+       /* Kernel truncates args[0] to int, we do the same. */
        nfds = (int) args[0];
 
        /* Kernel rejects negative nfds, so we don't parse it either. */
-       if (nfds < 0) {
+       if (nfds < 0)
                nfds = 0;
-               fds = NULL;
-       }
+
        /* Beware of select(2^31-1, NULL, NULL, NULL) and similar... */
        if (nfds > 1024*1024)
                nfds = 1024*1024;
@@ -627,26 +100,18 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
        if (entering(tcp)) {
                tprintf("%d", (int) args[0]);
 
-               if (fdsize > 0) {
+               if (verbose(tcp) && fdsize > 0)
                        fds = malloc(fdsize);
-                       if (!fds)
-                               die_out_of_memory();
-               }
                for (i = 0; i < 3; i++) {
-                       arg = args[i+1];
-                       if (arg == 0) {
-                               tprints(", NULL");
-                               continue;
-                       }
-                       if (!verbose(tcp) || !fds) {
-                               tprintf(", %#lx", arg);
+                       addr = args[i+1];
+                       tprints(", ");
+                       if (!fds) {
+                               printaddr(addr);
                                continue;
                        }
-                       if (umoven(tcp, arg, fdsize, (char *) fds) < 0) {
-                               tprints(", [?]");
+                       if (umoven_or_printaddr(tcp, addr, fdsize, fds))
                                continue;
-                       }
-                       tprints(", [");
+                       tprints("[");
                        for (j = 0, sep = "";; j++) {
                                j = next_set_bit(fds, j, nfds);
                                if (j < 0)
@@ -659,9 +124,8 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                }
                free(fds);
                tprints(", ");
-               printtv_bitness(tcp, args[4], bitness, 0);
-       }
-       else {
+               print_tv_ts(tcp, args[4]);
+       } else {
                static char outstr[1024];
                char *outptr;
 #define end_outstr (outstr + sizeof(outstr))
@@ -677,16 +141,14 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                }
 
                fds = malloc(fdsize);
-               if (!fds)
-                       die_out_of_memory();
 
                outptr = outstr;
                sep = "";
                for (i = 0; i < 3 && ready_fds > 0; i++) {
                        int first = 1;
 
-                       arg = args[i+1];
-                       if (!arg || umoven(tcp, arg, fdsize, (char *) fds) < 0)
+                       addr = args[i+1];
+                       if (!addr || !fds || umoven(tcp, addr, fdsize, fds) < 0)
                                continue;
                        for (j = 0;; j++) {
                                j = next_set_bit(fds, j, nfds);
@@ -702,8 +164,7 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                                                );
                                                first = 0;
                                                sep = ", ";
-                                       }
-                                       else {
+                                       } else {
                                                outptr += sprintf(outptr, " %u", j);
                                        }
                                }
@@ -716,9 +177,9 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                free(fds);
                /* This contains no useful information on SunOS.  */
                if (args[4]) {
-                       if (outptr < end_outstr - (10 + TIMEVAL_TEXT_BUFSIZE)) {
-                               outptr += sprintf(outptr, "%sleft ", sep);
-                               outptr = sprinttv(outptr, tcp, args[4], bitness, /*special:*/ 0);
+                       const char *str = sprint_tv_ts(tcp, args[4]);
+                       if (outptr + sizeof("left ") + strlen(sep) + strlen(str) < end_outstr) {
+                               outptr += sprintf(outptr, "%sleft %s", sep, str);
                        }
                }
                *outptr = '\0';
@@ -729,506 +190,77 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
        return 0;
 }
 
-int
-sys_oldselect(struct tcb *tcp)
-{
-       long args[5];
-
-       if (umoven(tcp, tcp->u_arg[0], sizeof args, (char *) args) < 0) {
-               tprints("[...]");
-               return 0;
-       }
-       return decode_select(tcp, args, BITNESS_CURRENT);
-}
-
-#ifdef ALPHA
-int
-sys_osf_select(struct tcb *tcp)
-{
-       long *args = tcp->u_arg;
-       return decode_select(tcp, args, BITNESS_32);
-}
-#endif
-
-static const struct xlat epollctls[] = {
-#ifdef EPOLL_CTL_ADD
-       { EPOLL_CTL_ADD,        "EPOLL_CTL_ADD" },
-#endif
-#ifdef EPOLL_CTL_MOD
-       { EPOLL_CTL_MOD,        "EPOLL_CTL_MOD" },
-#endif
-#ifdef EPOLL_CTL_DEL
-       { EPOLL_CTL_DEL,        "EPOLL_CTL_DEL" },
-#endif
-       { 0,                    NULL            }
-};
-
-static const struct xlat epollevents[] = {
-#ifdef EPOLLIN
-       { EPOLLIN,      "EPOLLIN"       },
-#endif
-#ifdef EPOLLPRI
-       { EPOLLPRI,     "EPOLLPRI"      },
-#endif
-#ifdef EPOLLOUT
-       { EPOLLOUT,     "EPOLLOUT"      },
-#endif
-#ifdef EPOLLRDNORM
-       { EPOLLRDNORM,  "EPOLLRDNORM"   },
-#endif
-#ifdef EPOLLRDBAND
-       { EPOLLRDBAND,  "EPOLLRDBAND"   },
-#endif
-#ifdef EPOLLWRNORM
-       { EPOLLWRNORM,  "EPOLLWRNORM"   },
-#endif
-#ifdef EPOLLWRBAND
-       { EPOLLWRBAND,  "EPOLLWRBAND"   },
-#endif
-#ifdef EPOLLMSG
-       { EPOLLMSG,     "EPOLLMSG"      },
-#endif
-#ifdef EPOLLERR
-       { EPOLLERR,     "EPOLLERR"      },
-#endif
-#ifdef EPOLLHUP
-       { EPOLLHUP,     "EPOLLHUP"      },
-#endif
-#ifdef EPOLLRDHUP
-       { EPOLLRDHUP,   "EPOLLRDHUP"    },
-#endif
-#ifdef EPOLLONESHOT
-       { EPOLLONESHOT, "EPOLLONESHOT"  },
-#endif
-#ifdef EPOLLET
-       { EPOLLET,      "EPOLLET"       },
-#endif
-       { 0,            NULL            }
-};
-
-/* Not aliased to printargs_ld: we want it to have a distinct address */
-int
-sys_epoll_create(struct tcb *tcp)
-{
-       return printargs_ld(tcp);
-}
-
-static const struct xlat epollflags[] = {
-#ifdef EPOLL_CLOEXEC
-       { EPOLL_CLOEXEC,        "EPOLL_CLOEXEC" },
-#endif
-#ifdef EPOLL_NONBLOCK
-       { EPOLL_NONBLOCK,       "EPOLL_NONBLOCK"        },
-#endif
-       { 0,            NULL            }
-};
-
-int
-sys_epoll_create1(struct tcb *tcp)
-{
-       if (entering(tcp))
-               printflags(epollflags, tcp->u_arg[0], "EPOLL_???");
-       return 0;
-}
-
-#ifdef HAVE_SYS_EPOLL_H
-static void
-print_epoll_event(struct epoll_event *ev)
+SYS_FUNC(oldselect)
 {
-       tprints("{");
-       printflags(epollevents, ev->events, "EPOLL???");
-       /* We cannot know what format the program uses, so print u32 and u64
-          which will cover every value.  */
-       tprintf(", {u32=%" PRIu32 ", u64=%" PRIu64 "}}",
-               ev->data.u32, ev->data.u64);
-}
-#endif
+       kernel_ulong_t select_args[5];
+       unsigned int oldselect_args[5];
 
-int
-sys_epoll_ctl(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printxval(epollctls, tcp->u_arg[1], "EPOLL_CTL_???");
-               tprints(", ");
-               printfd(tcp, tcp->u_arg[2]);
-               tprints(", ");
-               if (tcp->u_arg[3] == 0)
-                       tprints("NULL");
-               else {
-#ifdef HAVE_SYS_EPOLL_H
-                       struct epoll_event ev;
-                       if (umove(tcp, tcp->u_arg[3], &ev) == 0)
-                               print_epoll_event(&ev);
-                       else
-#endif
-                               tprints("{...}");
+       if (sizeof(*select_args) == sizeof(*oldselect_args)) {
+               if (umove_or_printaddr(tcp, tcp->u_arg[0], &select_args)) {
+                       return 0;
                }
-       }
-       return 0;
-}
-
-static void
-epoll_wait_common(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
        } else {
-               if (syserror(tcp))
-                       tprintf("%lx", tcp->u_arg[1]);
-               else if (tcp->u_rval == 0)
-                       tprints("{}");
-               else {
-#ifdef HAVE_SYS_EPOLL_H
-                       struct epoll_event ev, *start, *cur, *end;
-                       int failed = 0;
+               unsigned int i;
 
-                       tprints("{");
-                       start = (struct epoll_event *) tcp->u_arg[1];
-                       end = start + tcp->u_rval;
-                       for (cur = start; cur < end; ++cur) {
-                               if (cur > start)
-                                       tprints(", ");
-                               if (umove(tcp, (long) cur, &ev) == 0)
-                                       print_epoll_event(&ev);
-                               else {
-                                       tprints("?");
-                                       failed = 1;
-                                       break;
-                               }
-                       }
-                       tprints("}");
-                       if (failed)
-                               tprintf(" %#lx", (long) start);
-#else
-                       tprints("{...}");
-#endif
+               if (umove_or_printaddr(tcp, tcp->u_arg[0], &oldselect_args)) {
+                       return 0;
                }
-               tprintf(", %d, %d", (int) tcp->u_arg[2], (int) tcp->u_arg[3]);
-       }
-}
 
-int
-sys_epoll_wait(struct tcb *tcp)
-{
-       epoll_wait_common(tcp);
-       return 0;
-}
-
-int
-sys_epoll_pwait(struct tcb *tcp)
-{
-       epoll_wait_common(tcp);
-       if (exiting(tcp)) {
-               tprints(", ");
-               /* NB: kernel requires arg[5] == NSIG / 8 */
-               print_sigset_addr_len(tcp, tcp->u_arg[4], tcp->u_arg[5]);
-               tprintf(", %lu", tcp->u_arg[5]);
-       }
-       return 0;
-}
-
-int
-sys_io_setup(struct tcb *tcp)
-{
-       if (entering(tcp))
-               tprintf("%ld, ", tcp->u_arg[0]);
-       else {
-               if (syserror(tcp))
-                       tprintf("0x%0lx", tcp->u_arg[1]);
-               else {
-                       unsigned long user_id;
-                       if (umove(tcp, tcp->u_arg[1], &user_id) == 0)
-                               tprintf("{%lu}", user_id);
-                       else
-                               tprints("{...}");
+               for (i = 0; i < 5; ++i) {
+                       select_args[i] = oldselect_args[i];
                }
        }
-       return 0;
-}
 
-int
-sys_io_destroy(struct tcb *tcp)
-{
-       if (entering(tcp))
-               tprintf("%lu", tcp->u_arg[0]);
-       return 0;
-}
-
-#ifdef HAVE_LIBAIO_H
-
-enum iocb_sub {
-       SUB_NONE, SUB_COMMON, SUB_POLL, SUB_VECTOR
-};
-
-static enum iocb_sub
-tprint_lio_opcode(unsigned cmd)
-{
-       static const struct {
-               const char *name;
-               enum iocb_sub sub;
-       } cmds[] = {
-               { "pread", SUB_COMMON },
-               { "pwrite", SUB_COMMON },
-               { "fsync", SUB_NONE },
-               { "fdsync", SUB_NONE },
-               { "op4", SUB_NONE },
-               { "poll", SUB_POLL },
-               { "noop", SUB_NONE },
-               { "preadv", SUB_VECTOR },
-               { "pwritev", SUB_VECTOR },
-       };
-
-       if (cmd < ARRAY_SIZE(cmds)) {
-               tprints(cmds[cmd].name);
-               return cmds[cmd].sub;
-       }
-       tprintf("%u /* SUB_??? */", cmd);
-       return SUB_NONE;
+       return decode_select(tcp, select_args, print_timeval, sprint_timeval);
 }
 
-static void
-print_common_flags(struct iocb *iocb)
+#ifdef ALPHA
+SYS_FUNC(osf_select)
 {
-       if (iocb->u.c.flags & IOCB_RESFD)
-               tprintf(", resfd=%d", iocb->u.c.resfd);
-       if (iocb->u.c.flags & ~IOCB_RESFD)
-               tprintf(", flags=%x", iocb->u.c.flags);
+       return decode_select(tcp, tcp->u_arg, print_timeval32, sprint_timeval32);
 }
-
-#endif /* HAVE_LIBAIO_H */
-
-int
-sys_io_submit(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-#ifdef HAVE_LIBAIO_H
-               long nr = tcp->u_arg[1];
-               /* if nr <= 0, we end up printing just "{}" */
-               tprintf("%lu, %ld, {", tcp->u_arg[0], tcp->u_arg[1]);
-               {
-                       long i;
-                       struct iocb **iocbs = (void *)tcp->u_arg[2];
-//FIXME: decoding of 32-bit call by 64-bit strace
-
-                       for (i = 0; i < nr; i++, iocbs++) {
-                               enum iocb_sub sub;
-                               struct iocb *iocbp;
-                               struct iocb iocb;
-                               if (i)
-                                       tprints(", ");
-
-                               if (umove(tcp, (unsigned long)iocbs, &iocbp)) {
-                                       tprintf("%#lx", (unsigned long)iocbs);
-                                       /* No point in trying to read iocbs+1 etc */
-                                       /* (nr can be ridiculously large): */
-                                       break;
-                               }
-                               if (umove(tcp, (unsigned long)iocbp, &iocb)) {
-                                       tprintf("{%#lx}", (unsigned long)iocbp);
-                                       continue;
-                               }
-                               tprints("{");
-                               if (iocb.data)
-                                       tprintf("data:%p, ", iocb.data);
-                               if (iocb.key)
-                                       tprintf("key:%u, ", iocb.key);
-                               sub = tprint_lio_opcode(iocb.aio_lio_opcode);
-                               if (iocb.aio_reqprio)
-                                       tprintf(", reqprio:%d", iocb.aio_reqprio);
-                               tprintf(", filedes:%d", iocb.aio_fildes);
-                               switch (sub) {
-                               case SUB_COMMON:
-                                       if (iocb.aio_lio_opcode == IO_CMD_PWRITE) {
-                                               tprints(", str:");
-                                               printstr(tcp, (unsigned long)iocb.u.c.buf,
-                                                        iocb.u.c.nbytes);
-                                       } else
-                                               tprintf(", buf:%p", iocb.u.c.buf);
-                                       tprintf(", nbytes:%lu, offset:%lld",
-                                               iocb.u.c.nbytes,
-                                               iocb.u.c.offset);
-                                       print_common_flags(&iocb);
-                                       break;
-                               case SUB_VECTOR:
-                                       tprintf(", %lld", iocb.u.v.offset);
-                                       print_common_flags(&iocb);
-                                       tprints(", ");
-                                       tprint_iov(tcp, iocb.u.v.nr,
-                                                  (unsigned long)iocb.u.v.vec,
-                                                  iocb.aio_lio_opcode == IO_CMD_PWRITEV
-                                                 );
-                                       break;
-                               case SUB_POLL:
-                                       tprintf(", %x", iocb.u.poll.events);
-                                       break;
-                               case SUB_NONE:
-                                       break;
-                               }
-                               tprints("}");
-                       }
-               }
-               tprints("}");
-#else
-               tprintf("%lu, %ld, %#lx", tcp->u_arg[0], tcp->u_arg[1], tcp->u_arg[2]);
 #endif
-       }
-       return 0;
-}
 
-int
-sys_io_cancel(struct tcb *tcp)
+SYS_FUNC(select)
 {
-       if (entering(tcp)) {
-#ifdef HAVE_LIBAIO_H
-               struct iocb iocb;
-#endif
-               tprintf("%lu, ", tcp->u_arg[0]);
-#ifdef HAVE_LIBAIO_H
-               if (umove(tcp, tcp->u_arg[1], &iocb) == 0) {
-                       tprintf("{%p, %u, %u, %u, %d}, ",
-                               iocb.data, iocb.key,
-                               (unsigned)iocb.aio_lio_opcode,
-                               (unsigned)iocb.aio_reqprio, iocb.aio_fildes);
-               } else
-#endif
-                       tprints("{...}, ");
-       } else {
-               if (tcp->u_rval < 0)
-                       tprints("{...}");
-               else {
-#ifdef HAVE_LIBAIO_H
-                       struct io_event event;
-                       if (umove(tcp, tcp->u_arg[2], &event) == 0)
-                               tprintf("{%p, %p, %ld, %ld}",
-                                       event.data, event.obj,
-                                       event.res, event.res2);
-                       else
-#endif
-                               tprints("{...}");
-               }
-       }
-       return 0;
+       return decode_select(tcp, tcp->u_arg, print_timeval, sprint_timeval);
 }
 
-int
-sys_io_getevents(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%ld, %ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1],
-                       tcp->u_arg[2]);
-       } else {
-               if (tcp->u_rval == 0) {
-                       tprints("{}");
-               } else {
-#ifdef HAVE_LIBAIO_H
-                       struct io_event *events = (void *)tcp->u_arg[3];
-                       long i, nr = tcp->u_rval;
-
-                       for (i = 0; i < nr; i++, events++) {
-                               struct io_event event;
-
-                               if (i == 0)
-                                       tprints("{");
-                               else
-                                       tprints(", ");
-
-                               if (umove(tcp, (unsigned long)events, &event) != 0) {
-                                       tprints("{...}");
-                                       continue;
-                               }
-                               tprintf("{%p, %p, %ld, %ld}", event.data,
-                                       event.obj, event.res, event.res2);
-                       }
-                       tprints("}, ");
-#else
-                       tprints("{...}");
-#endif
+static int
+umove_kulong_array_or_printaddr(struct tcb *const tcp, const kernel_ulong_t addr,
+                               kernel_ulong_t *const ptr, const size_t n)
+{
+#ifndef current_klongsize
+       if (current_klongsize < sizeof(*ptr)) {
+               uint32_t ptr32[n];
+               int r = umove_or_printaddr(tcp, addr, &ptr32);
+               if (!r) {
+                       size_t i;
+
+                       for (i = 0; i < n; ++i)
+                               ptr[i] = ptr32[i];
                }
-
-               print_timespec(tcp, tcp->u_arg[4]);
+               return r;
        }
-       return 0;
+#endif /* !current_klongsize */
+       return umoven_or_printaddr(tcp, addr, n * sizeof(*ptr), ptr);
 }
 
-int
-sys_select(struct tcb *tcp)
+SYS_FUNC(pselect6)
 {
-       return decode_select(tcp, tcp->u_arg, BITNESS_CURRENT);
-}
-
-int
-sys_pselect6(struct tcb *tcp)
-{
-       int rc = decode_select(tcp, tcp->u_arg, BITNESS_CURRENT);
+       int rc = decode_select(tcp, tcp->u_arg, print_timespec, sprint_timespec);
        if (entering(tcp)) {
-               long r;
-               struct {
-                       unsigned long ptr;
-                       unsigned long len;
-               } data;
-#if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
-               if (current_wordsize == 4) {
-                       struct {
-                               uint32_t ptr;
-                               uint32_t len;
-                       } data32;
-                       r = umove(tcp, tcp->u_arg[5], &data32);
-                       data.ptr = data32.ptr;
-                       data.len = data32.len;
-               } else
-#endif
-                       r = umove(tcp, tcp->u_arg[5], &data);
-               if (r < 0)
-                       tprintf(", %#lx", tcp->u_arg[5]);
-               else {
-                       tprints(", {");
-                       /* NB: kernel requires data.len == NSIG / 8 */
-                       print_sigset_addr_len(tcp, data.ptr, data.len);
-                       tprintf(", %lu}", data.len);
-               }
-       }
-       return rc;
-}
+               kernel_ulong_t data[2];
 
-static int
-do_eventfd(struct tcb *tcp, int flags_arg)
-{
-       if (entering(tcp)) {
-               tprintf("%lu", tcp->u_arg[0]);
-               if (flags_arg >= 0) {
-                       tprints(", ");
-                       printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+               tprints(", ");
+               if (!umove_kulong_array_or_printaddr(tcp, tcp->u_arg[5],
+                                                    data, ARRAY_SIZE(data))) {
+                       tprints("{");
+                       /* NB: kernel requires data[1] == NSIG_BYTES */
+                       print_sigset_addr_len(tcp, data[0], data[1]);
+                       tprintf(", %" PRI_klu "}", data[1]);
                }
        }
-       return 0;
-}
-
-int
-sys_eventfd(struct tcb *tcp)
-{
-       return do_eventfd(tcp, -1);
-}
 
-int
-sys_eventfd2(struct tcb *tcp)
-{
-       return do_eventfd(tcp, 1);
-}
-
-int
-sys_perf_event_open(struct tcb *tcp)
-{
-       if (entering(tcp)) {
-               tprintf("%#lx, %d, %d, %d, ",
-                       tcp->u_arg[0],
-                       (int) tcp->u_arg[1],
-                       (int) tcp->u_arg[2],
-                       (int) tcp->u_arg[3]);
-               printflags(perf_event_open_flags, tcp->u_arg[4],
-                          "PERF_FLAG_???");
-       }
-       return 0;
+       return rc;
 }