]> granicus.if.org Git - strace/blobdiff - desc.c
tests: add a test for rt_sigaction output
[strace] / desc.c
diff --git a/desc.c b/desc.c
index 3b76e7eaa9a9f752d21f14cb85fb0f29f56f6bc1..3ccf422af01cdb4c46084a1a231ca19707143820 100644 (file)
--- a/desc.c
+++ b/desc.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/file.h>
+#ifdef HAVE_SYS_EPOLL_H
+# include <sys/epoll.h>
+#endif
+#ifdef HAVE_LINUX_PERF_EVENT_H
+# include  <linux/perf_event.h>
+#endif
 
-static struct xlat fcntlcmds[] = {
+static const struct xlat fcntlcmds[] = {
        { F_DUPFD,      "F_DUPFD"       },
        { F_GETFD,      "F_GETFD"       },
        { F_SETFD,      "F_SETFD"       },
@@ -56,11 +60,95 @@ static struct xlat fcntlcmds[] = {
 #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 struct xlat fdflags[] = {
+static const struct xlat fdflags[] = {
 #ifdef FD_CLOEXEC
        { FD_CLOEXEC,   "FD_CLOEXEC"    },
 #endif
@@ -69,7 +157,7 @@ static struct xlat fdflags[] = {
 
 #ifdef LOCK_SH
 
-static struct xlat flockcmds[] = {
+static const struct xlat flockcmds[] = {
        { LOCK_SH,      "LOCK_SH"       },
        { LOCK_EX,      "LOCK_EX"       },
        { LOCK_NB,      "LOCK_NB"       },
@@ -79,7 +167,7 @@ static struct xlat flockcmds[] = {
 
 #endif /* LOCK_SH */
 
-static struct xlat lockfcmds[] = {
+static const struct xlat lockfcmds[] = {
        { F_RDLCK,      "F_RDLCK"       },
        { F_WRLCK,      "F_WRLCK"       },
        { F_UNLCK,      "F_UNLCK"       },
@@ -92,109 +180,260 @@ static struct xlat lockfcmds[] = {
        { 0,            NULL            },
 };
 
-static struct xlat whence[] = {
-       { SEEK_SET,     "SEEK_SET"      },
-       { SEEK_CUR,     "SEEK_CUR"      },
-       { SEEK_END,     "SEEK_END"      },
+#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 defined(F_SETLK64) && F_SETLK64 + 0 != F_SETLK
+# define HAVE_F_SETLK64 1
+#else
+# define HAVE_F_SETLK64 0
+#endif
+
+#if defined(F_SETLKW64) && F_SETLKW64 + 0 != F_SETLKW
+# define HAVE_F_SETLKW64 1
+#else
+# define HAVE_F_SETLKW64 0
+#endif
+
+#if defined(F_GETLK64) && F_GETLK64+0 != F_GETLK
+# define HAVE_F_GETLK64 1
+#else
+# define HAVE_F_GETLK64 0
+#endif
+
+#if defined(X32) || defined(F_FREESP64) || \
+    HAVE_F_SETLK64 || HAVE_F_SETLKW64 || HAVE_F_GETLK64
+
+#ifndef HAVE_STRUCT_FLOCK64
+struct flock64 {
+       short int l_type, l_whence;
+       int64_t l_start, l_len;
+       int l_pid;
+};
+#endif
 
 /* fcntl/lockf */
 static void
-printflock(tcp, addr, getlk)
-struct tcb *tcp;
-int addr;
-int getlk;
+printflock64(struct tcb *tcp, long addr, int getlk)
 {
-       struct flock fl;
+       struct flock64 fl;
 
        if (umove(tcp, addr, &fl) < 0) {
-               tprintf("{...}");
+               tprints("{...}");
                return;
        }
-       tprintf("{type=");
+       tprints("{type=");
        printxval(lockfcmds, fl.l_type, "F_???");
-       tprintf(", whence=");
-       printxval(whence, fl.l_whence, "SEEK_???");
-       tprintf(", start=%ld, len=%ld", fl.l_start, fl.l_len);
+       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
-               tprintf("}");
+               tprints("}");
 }
+#endif
 
-static char *
-sprintflags(xlat, flags)
-struct xlat *xlat;
-int flags;
+/* fcntl/lockf */
+static void
+printflock(struct tcb *tcp, long addr, int getlk)
 {
-       static char outstr[1024];
-       char *sep;
-
-       strcpy(outstr, "flags ");
-       sep = "";
-       for (; xlat->str; xlat++) {
-               if ((flags & xlat->val) == xlat->val) {
-                       sprintf(outstr + strlen(outstr),
-                               "%s%s", sep, xlat->str);
-                       sep = "|";
-                       flags &= ~xlat->val;
+       struct flock fl;
+
+#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;
                }
        }
-       if (flags)
-               sprintf(outstr + strlen(outstr),
-                       "%s%#x", sep, flags);
-       return outstr;
+       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(tcp)
-struct tcb *tcp;
+sys_fcntl(struct tcb *tcp)
 {
-       extern struct xlat openmodes[];
-
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
                printxval(fcntlcmds, tcp->u_arg[1], "F_???");
                switch (tcp->u_arg[1]) {
                case F_SETFD:
-                       tprintf(", ");
-                       if (printflags(fdflags, tcp->u_arg[2]) == 0)
-                               tprintf("0");
+                       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:
-                       tprintf(", ");
-                       if (printflags(openmodes, tcp->u_arg[2] + 1) == 0)
-                               tprintf("0");
+                       tprints(", ");
+                       tprint_open_modes(tcp->u_arg[2]);
                        break;
                case F_SETLK: case F_SETLKW:
-                       tprintf(", ");
+#ifdef F_FREESP
+               case F_FREESP:
+#endif
+                       tprints(", ");
                        printflock(tcp, tcp->u_arg[2], 0);
                        break;
+#if defined(F_FREESP64) || HAVE_F_SETLK64 || HAVE_F_SETLKW64
+#ifdef F_FREESP64
+               case F_FREESP64:
+#endif
+               /* Linux glibc defines SETLK64 as SETLK,
+                  even though the kernel has different values - as does Solaris. */
+#if HAVE_F_SETLK64
+               case F_SETLK64:
+#endif
+#if HAVE_F_SETLKW64
+               case F_SETLKW64:
+#endif
+                       tprints(", ");
+                       printflock64(tcp, tcp->u_arg[2], 0);
+                       break;
+#endif /* defined(F_FREESP64) || HAVE_F_SETLK64 || HAVE_F_SETLKW64 */
+#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 (tcp->u_rval == 0)
+                       if (syserror(tcp) || tcp->u_rval == 0)
                                return 0;
-                       tcp->auxstr = sprintflags(fdflags, tcp->u_rval);
+                       tcp->auxstr = sprintflags("flags ", fdflags, tcp->u_rval);
                        return RVAL_HEX|RVAL_STR;
                case F_GETFL:
-                       tcp->auxstr = sprintflags(openmodes, tcp->u_rval + 1);
+                       if (syserror(tcp))
+                               return 0;
+                       tcp->auxstr = sprint_open_modes(tcp->u_rval);
                        return RVAL_HEX|RVAL_STR;
                case F_GETLK:
-                       tprintf(", ");
+                       tprints(", ");
                        printflock(tcp, tcp->u_arg[2], 1);
                        break;
+#if HAVE_F_GETLK64
+               case F_GETLK64:
+                       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;
@@ -206,217 +445,470 @@ struct tcb *tcp;
 #ifdef LOCK_SH
 
 int
-sys_flock(tcp)
-struct tcb *tcp;
+sys_flock(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               if (!printflags(flockcmds, tcp->u_arg[1]))
-                       tprintf("LOCK_???");
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               printflags(flockcmds, tcp->u_arg[1], "LOCK_???");
        }
        return 0;
 }
 #endif /* LOCK_SH */
 
 int
-sys_close(tcp)
-struct tcb *tcp;
+sys_close(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
        }
        return 0;
 }
 
-int
-sys_dup(tcp)
-struct tcb *tcp;
+static int
+do_dup2(struct tcb *tcp, int flags_arg)
 {
        if (entering(tcp)) {
-               tprintf("%ld", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               printfd(tcp, tcp->u_arg[1]);
+               if (flags_arg >= 0) {
+                       tprints(", ");
+                       printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+               }
        }
        return 0;
 }
 
 int
-sys_dup2(tcp)
-struct tcb *tcp;
+sys_dup2(struct tcb *tcp)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, %ld", tcp->u_arg[0], tcp->u_arg[1]);
-       }
-       return 0;
+       return do_dup2(tcp, -1);
 }
 
 int
-sys_getdtablesize(tcp)
-struct tcb *tcp;
+sys_dup3(struct tcb *tcp)
+{
+       return do_dup2(tcp, 2);
+}
+
+#if defined(ALPHA)
+int
+sys_getdtablesize(struct tcb *tcp)
 {
        return 0;
 }
+#endif
 
 static int
-decode_select(tcp, args, bitness)
-struct tcb *tcp;
-long *args;
-int bitness;
+decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
 {
-       int i, j, nfds;
-       fd_set fds;
-       struct timeval tv;
-#ifdef ALPHA
-       struct timeval32 {
-               unsigned tv_sec;
-               unsigned tv_usec;
-       } *tv32;
-#endif
-       static char outstr[1024];
-       char *sep;
+       int i, j;
+       int nfds, fdsize;
+       fd_set *fds;
+       const char *sep;
        long arg;
 
+       /* Kernel truncates arg[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) {
+               nfds = 0;
+               fds = NULL;
+       }
+       /* Beware of select(2^31-1, NULL, NULL, NULL) and similar... */
+       if (nfds > 1024*1024)
+               nfds = 1024*1024;
+
+       /*
+        * We had bugs a-la "while (j < args[0])" and "umoven(args[0])" below.
+        * Instead of args[0], use nfds for fd count, fdsize for array lengths.
+        */
+       fdsize = (((nfds + 7) / 8) + current_wordsize-1) & -current_wordsize;
+
        if (entering(tcp)) {
-               nfds = args[0];
-               tprintf("%d", nfds);
+               tprintf("%d", (int) args[0]);
+
+               if (fdsize > 0) {
+                       fds = malloc(fdsize);
+                       if (!fds)
+                               die_out_of_memory();
+               }
                for (i = 0; i < 3; i++) {
                        arg = args[i+1];
                        if (arg == 0) {
-                               tprintf(", NULL");
+                               tprints(", NULL");
                                continue;
                        }
-                       if (!verbose(tcp)) {
+                       if (!verbose(tcp) || !fds) {
                                tprintf(", %#lx", arg);
                                continue;
                        }
-                       if (umove(tcp, arg, &fds) < 0) {
-                               tprintf(", [?]");
+                       if (umoven(tcp, arg, fdsize, (char *) fds) < 0) {
+                               tprints(", [?]");
                                continue;
                        }
-                       tprintf(", [");
-                       for (j = 0, sep = ""; j < nfds; j++) {
-                               if (FD_ISSET(j, &fds)) {
-                                       tprintf("%s%u", sep, j);
-                                       sep = " ";
-                               }
+                       tprints(", [");
+                       for (j = 0, sep = "";; j++) {
+                               j = next_set_bit(fds, j, nfds);
+                               if (j < 0)
+                                       break;
+                               tprints(sep);
+                               printfd(tcp, j);
+                               sep = " ";
                        }
-                       tprintf("]");
-               }
-               if (!args[4])
-                       tprintf(", NULL");
-               else if (!verbose(tcp))
-                       tprintf(", %#lx", args[4]);
-               else if (umove(tcp, args[4], &tv) < 0)
-                       tprintf(", {...}");
-               else {
-#ifdef ALPHA
-                       if (bitness) {
-                               tv32=(struct timeval32*)&tv;
-                               tprintf(", {%u, %u}", tv32->tv_sec, tv32->tv_usec);
-                       } else
-#endif
-                               tprintf(", {%lu, %lu}",
-                                       (long) tv.tv_sec, (long) tv.tv_usec);
+                       tprints("]");
                }
+               free(fds);
+               tprints(", ");
+               printtv_bitness(tcp, args[4], bitness, 0);
        }
-       else
-       {
-               unsigned int cumlen = 0;
-               char *sep = "";
+       else {
+               static char outstr[1024];
+               char *outptr;
+#define end_outstr (outstr + sizeof(outstr))
+               int ready_fds;
 
                if (syserror(tcp))
                        return 0;
 
-               if ((nfds = tcp->u_rval) == 0) {
+               ready_fds = tcp->u_rval;
+               if (ready_fds == 0) {
                        tcp->auxstr = "Timeout";
                        return RVAL_STR;
                }
-               outstr[0] = '\0';
-               for (i = 0; i < 3; i++) {
+
+               fds = malloc(fdsize);
+               if (!fds)
+                       die_out_of_memory();
+
+               outptr = outstr;
+               sep = "";
+               for (i = 0; i < 3 && ready_fds > 0; i++) {
                        int first = 1;
-                       char str[20];
 
-                       tcp->auxstr = outstr;
                        arg = args[i+1];
-                       if (!arg || umove(tcp, arg, &fds) < 0)
+                       if (!arg || umoven(tcp, arg, fdsize, (char *) fds) < 0)
                                continue;
-                       for (j = 0; j < args[0]; j++) {
-                               if (FD_ISSET(j, &fds)) {
+                       for (j = 0;; j++) {
+                               j = next_set_bit(fds, j, nfds);
+                               if (j < 0)
+                                       break;
+                               /* +2 chars needed at the end: ']',NUL */
+                               if (outptr < end_outstr - (sizeof(", except [") + sizeof(int)*3 + 2)) {
                                        if (first) {
-                                               sprintf(str, "%s%s [%u", sep,
-                                                       i == 0 ? "in" :
-                                                       i == 1 ? "out" :
-                                                       "except", j);
+                                               outptr += sprintf(outptr, "%s%s [%u",
+                                                       sep,
+                                                       i == 0 ? "in" : i == 1 ? "out" : "except",
+                                                       j
+                                               );
                                                first = 0;
                                                sep = ", ";
                                        }
-                                       else
-                                               sprintf(str, " %u", j);
-                                       cumlen += strlen(str);
-                                       if (cumlen < sizeof(outstr))
-                                               strcat(outstr, str);
-                                       nfds--;
+                                       else {
+                                               outptr += sprintf(outptr, " %u", j);
+                                       }
                                }
+                               if (--ready_fds == 0)
+                                       break;
                        }
-                       if (cumlen)
-                               strcat(outstr, "]");
-                       if (nfds == 0)
-                               break;
+                       if (outptr != outstr)
+                               *outptr++ = ']';
                }
-#ifdef LINUX
+               free(fds);
                /* This contains no useful information on SunOS.  */
                if (args[4]) {
-                       char str[20];
-
-                       if (umove(tcp, args[4], &tv) >= 0) {
-#ifdef ALPHA
-                               if (bitness) {
-                                       tv32=(struct timeval32*)&tv;
-                                       sprintf(str, "%sleft {%u, %u}", sep,
-                                               tv32->tv_sec, tv32->tv_usec);
-                               } else
-#endif
-                                       sprintf(str, "%sleft {%lu, %lu}", sep,
-                                               (long) tv.tv_sec, (long) tv.tv_usec);
-
-                               if ((cumlen += strlen(str)) < sizeof(outstr))
-                                       strcat(outstr, str);
+                       if (outptr < end_outstr - (10 + TIMEVAL_TEXT_BUFSIZE)) {
+                               outptr += sprintf(outptr, "%sleft ", sep);
+                               outptr = sprinttv(outptr, tcp, args[4], bitness, /*special:*/ 0);
                        }
                }
-#endif /* LINUX */
+               *outptr = '\0';
+               tcp->auxstr = outstr;
                return RVAL_STR;
+#undef end_outstr
        }
        return 0;
 }
 
-#ifdef LINUX
-
 int
-sys_oldselect(tcp)
-struct tcb *tcp;
+sys_oldselect(struct tcb *tcp)
 {
        long args[5];
 
        if (umoven(tcp, tcp->u_arg[0], sizeof args, (char *) args) < 0) {
-               tprintf("[...]");
+               tprints("[...]");
                return 0;
        }
-       return decode_select(tcp, args, 0);
+       return decode_select(tcp, args, BITNESS_CURRENT);
 }
 
 #ifdef ALPHA
-sys_osf_select(tcp)
-struct tcb *tcp;
+int
+sys_osf_select(struct tcb *tcp)
 {
        long *args = tcp->u_arg;
-       return decode_select(tcp, args, 1);
+       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;
+}
 
-#endif /* LINUX */
+#ifdef HAVE_SYS_EPOLL_H
+static void
+print_epoll_event(struct epoll_event *ev)
+{
+       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
 
 int
-sys_select(tcp)
-struct tcb *tcp;
+sys_epoll_ctl(struct tcb *tcp)
 {
-       long *args = tcp->u_arg;
-       return decode_select(tcp, args, 0);
+       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("{...}");
+               }
+       }
+       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;
+
+                       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
+               }
+               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_select(struct tcb *tcp)
+{
+       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);
+       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;
+}
+
+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_???");
+               }
+       }
+       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;
 }