]> granicus.if.org Git - strace/blobdiff - desc.c
Fix "format not a string literal" warning caused by tprintf(str)
[strace] / desc.c
diff --git a/desc.c b/desc.c
index 031d5a134c1384dbb7553dfc2e43099f390480a5..5cb8a1a973dc82d35b02b1e31119abc6bea71471 100644 (file)
--- a/desc.c
+++ b/desc.c
@@ -147,6 +147,18 @@ static const struct xlat fcntlcmds[] = {
 #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            },
 };
@@ -183,6 +195,33 @@ static const struct xlat lockfcmds[] = {
        { 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 whence[] = {
        { SEEK_SET,     "SEEK_SET"      },
        { SEEK_CUR,     "SEEK_CUR"      },
@@ -193,16 +232,43 @@ static const struct xlat whence[] = {
 #ifndef HAVE_LONG_LONG_OFF_T
 /* fcntl/lockf */
 static void
-printflock(tcp, addr, getlk)
-struct tcb *tcp;
-long addr;
-int getlk;
+printflock(struct tcb *tcp, long addr, int getlk)
 {
        struct flock fl;
 
-       if (umove(tcp, addr, &fl) < 0) {
-               tprintf("{...}");
-               return;
+#if SUPPORTED_PERSONALITIES > 1
+       if (personality_wordsize[current_personality] != sizeof(fl.l_start)) {
+               if (personality_wordsize[current_personality] == 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) {
+                               tprintf("{...}");
+                               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> }",
+                               personality_wordsize[current_personality]);
+                       return;
+               }
+       } else
+#endif
+       {
+               if (umove(tcp, addr, &fl) < 0) {
+                       tprintf("{...}");
+                       return;
+               }
        }
        tprintf("{type=");
        printxval(lockfcmds, fl.l_type, "F_???");
@@ -219,10 +285,7 @@ int getlk;
 #if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
 /* fcntl/lockf */
 static void
-printflock64(tcp, addr, getlk)
-struct tcb *tcp;
-long addr;
-int getlk;
+printflock64(struct tcb *tcp, long addr, int getlk)
 {
        struct flock64 fl;
 
@@ -242,52 +305,27 @@ int getlk;
 }
 #endif
 
-static char *
-sprintflags(xlat, flags)
-const struct xlat *xlat;
-int flags;
-{
-       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;
-               }
-       }
-       if (flags)
-               sprintf(outstr + strlen(outstr),
-                       "%s%#x", sep, flags);
-       return outstr;
-}
-
 int
-sys_fcntl(tcp)
-struct tcb *tcp;
+sys_fcntl(struct tcb *tcp)
 {
-       extern const struct xlat openmodes[];
-
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprintf(", ");
                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");
+                       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");
+                       tprint_open_modes(tcp->u_arg[2]);
                        break;
                case F_SETLK: case F_SETLKW:
 #ifdef F_FREESP
@@ -302,46 +340,76 @@ struct tcb *tcp;
 #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
+#if defined(F_SETLK64) && F_SETLK64 + 0 != F_SETLK
                case F_SETLK64:
 #endif
-#if defined(F_SETLKW64) && F_SETLKW64+0!=F_SETLKW
+#if defined(F_SETLKW64) && F_SETLKW64 + 0 != F_SETLKW
                case F_SETLKW64:
 #endif
                        tprintf(", ");
                        printflock64(tcp, tcp->u_arg[2], 0);
                        break;
 #endif
-               }
+#ifdef F_NOTIFY
+               case F_NOTIFY:
+                       tprintf(", ");
+                       printflags(notifyflags, tcp->u_arg[2], "DN_???");
+                       break;
+#endif
+#ifdef F_SETLEASE
+               case F_SETLEASE:
+                       tprintf(", ");
+                       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(", ");
                        printflock(tcp, tcp->u_arg[2], 1);
                        break;
 #if _LFS64_LARGEFILE
-#if defined(F_GETLK64) && F_GETLK64+0!=F_GETLK
+#if defined(F_GETLK64) && F_GETLK64+0 != F_GETLK
                case F_GETLK64:
 #endif
                        tprintf(", ");
                        printflock64(tcp, tcp->u_arg[2], 1);
                        break;
 #endif
-               default:
+#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;
                }
@@ -352,82 +420,86 @@ 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]);
+               tprintf(", ");
+               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;
+sys_dup(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
        }
        return 0;
 }
 
-int
-sys_dup2(tcp)
-struct tcb *tcp;
+static int
+do_dup2(struct tcb *tcp, int flags_arg)
 {
        if (entering(tcp)) {
-               tprintf("%ld, %ld", tcp->u_arg[0], tcp->u_arg[1]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprintf(", ");
+               printfd(tcp, tcp->u_arg[1]);
+               if (flags_arg >= 0) {
+                       tprintf(", ");
+                       printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
+               }
        }
        return 0;
 }
 
 int
-sys_getdtablesize(tcp)
-struct tcb *tcp;
+sys_dup2(struct tcb *tcp)
+{
+       return do_dup2(tcp, -1);
+}
+
+#ifdef LINUX
+int
+sys_dup3(struct tcb *tcp)
+{
+       return do_dup2(tcp, 2);
+}
+#endif
+
+#if defined(ALPHA) || defined(FREEBSD) || defined(SUNOS4)
+int
+sys_getdtablesize(struct tcb *tcp)
 {
        return 0;
 }
+#endif /* ALPHA || FREEBSD || SUNOS4 */
 
 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;
        unsigned int fdsize = ((((args[0] + 7) / 8) + sizeof(long) - 1)
                               & -sizeof(long));
        fd_set *fds;
-       struct timeval tv;
-#ifdef ALPHA
-       struct timeval32 {
-               unsigned tv_sec;
-               unsigned tv_usec;
-       } *tv32;
-#endif
-       static char outstr[1024];
-       char *sep;
+       const char *sep;
        long arg;
 
        if (entering(tcp)) {
-               fds = (fd_set *) malloc(fdsize);
-               if (fds == NULL) {
-                       tprintf("out of memory\n");
-                       return 0;
-               }
+               fds = malloc(fdsize);
+               if (!fds)
+                       die_out_of_memory();
                nfds = args[0];
                tprintf("%d", nfds);
                for (i = 0; i < 3; i++) {
@@ -447,78 +519,67 @@ int bitness;
                        tprintf(", [");
                        for (j = 0, sep = ""; j < nfds; j++) {
                                if (FD_ISSET(j, fds)) {
-                                       tprintf("%s%u", sep, j);
+                                       tprints(sep);
+                                       printfd(tcp, j);
                                        sep = " ";
                                }
                        }
                        tprintf("]");
                }
                free(fds);
-               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);
-               }
+               tprintf(", ");
+               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))
+               const char *sep;
 
                if (syserror(tcp))
                        return 0;
 
-               if ((nfds = tcp->u_rval) == 0) {
+               nfds = tcp->u_rval;
+               if (nfds == 0) {
                        tcp->auxstr = "Timeout";
                        return RVAL_STR;
                }
 
-               fds = (fd_set *) malloc(fdsize);
-               if (fds == NULL) {
-                       tprintf("out of memory\n");
-                       return 0;
-               }
+               fds = malloc(fdsize);
+               if (!fds)
+                       die_out_of_memory();
 
-               outstr[0] = '\0';
+               tcp->auxstr = outstr;
+               outptr = outstr;
+               sep = "";
                for (i = 0; i < 3; i++) {
                        int first = 1;
-                       char str[20];
 
-                       tcp->auxstr = outstr;
                        arg = args[i+1];
                        if (!arg || umoven(tcp, arg, fdsize, (char *) fds) < 0)
                                continue;
                        for (j = 0; j < args[0]; j++) {
                                if (FD_ISSET(j, fds)) {
-                                       if (first) {
-                                               sprintf(str, "%s%s [%u", sep,
-                                                       i == 0 ? "in" :
-                                                       i == 1 ? "out" :
-                                                       "except", j);
-                                               first = 0;
-                                               sep = ", ";
+                                       /* +2 chars needed at the end: ']',NUL */
+                                       if (outptr < end_outstr - (sizeof(", except [") + sizeof(int)*3 + 2)) {
+                                               if (first) {
+                                                       outptr += sprintf(outptr, "%s%s [%u",
+                                                               sep,
+                                                               i == 0 ? "in" : i == 1 ? "out" : "except",
+                                                               j
+                                                       );
+                                                       first = 0;
+                                                       sep = ", ";
+                                               }
+                                               else {
+                                                       outptr += sprintf(outptr, " %u", j);
+                                               }
                                        }
-                                       else
-                                               sprintf(str, " %u", j);
-                                       cumlen += strlen(str);
-                                       if (cumlen < sizeof(outstr))
-                                               strcat(outstr, str);
                                        nfds--;
                                }
                        }
-                       if (cumlen)
-                               strcat(outstr, "]");
+                       if (outptr != outstr)
+                               *outptr++ = ']';
                        if (nfds == 0)
                                break;
                }
@@ -526,25 +587,15 @@ int bitness;
 #ifdef LINUX
                /* This contains no useful information on SunOS.  */
                if (args[4]) {
-                       char str[64];
-
-                       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 - 128) {
+                               outptr += sprintf(outptr, "%sleft ", sep);
+                               outptr = sprinttv(tcp, args[4], bitness, outptr);
                        }
                }
 #endif /* LINUX */
+               *outptr = '\0';
                return RVAL_STR;
+#undef end_outstr
        }
        return 0;
 }
@@ -552,8 +603,7 @@ int bitness;
 #ifdef LINUX
 
 int
-sys_oldselect(tcp)
-struct tcb *tcp;
+sys_oldselect(struct tcb *tcp)
 {
        long args[5];
 
@@ -561,20 +611,19 @@ struct tcb *tcp;
                tprintf("[...]");
                return 0;
        }
-       return decode_select(tcp, args, 0);
+       return decode_select(tcp, args, BITNESS_CURRENT);
 }
 
 #ifdef ALPHA
 int
-sys_osf_select(tcp)
-struct tcb *tcp;
+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 struct xlat epollctls[] = {
+static const struct xlat epollctls[] = {
 #ifdef EPOLL_CTL_ADD
        { EPOLL_CTL_ADD,        "EPOLL_CTL_ADD" },
 #endif
@@ -587,7 +636,7 @@ static struct xlat epollctls[] = {
        { 0,                    NULL            }
 };
 
-static struct xlat epollevents[] = {
+static const struct xlat epollevents[] = {
 #ifdef EPOLLIN
        { EPOLLIN,      "EPOLLIN"       },
 #endif
@@ -628,22 +677,27 @@ static struct xlat epollevents[] = {
 };
 
 int
-sys_epoll_create(tcp)
-struct tcb *tcp;
+sys_epoll_create(struct tcb *tcp)
 {
        if (entering(tcp))
                tprintf("%ld", tcp->u_arg[0]);
        return 0;
 }
 
+int
+sys_epoll_create1(struct tcb *tcp)
+{
+       if (entering(tcp))
+               printflags(open_mode_flags, tcp->u_arg[0], "O_???");
+       return 0;
+}
+
 #ifdef HAVE_SYS_EPOLL_H
 static void
-print_epoll_event(ev)
-struct epoll_event *ev;
+print_epoll_event(struct epoll_event *ev)
 {
        tprintf("{");
-       if (printflags(epollevents, ev->events) == 0)
-               tprintf("0");
+       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 "}}",
@@ -652,13 +706,15 @@ struct epoll_event *ev;
 #endif
 
 int
-sys_epoll_ctl(tcp)
-struct tcb *tcp;
+sys_epoll_ctl(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-                printxval(epollctls, tcp->u_arg[1], "EPOLL_CTL_???");
-               tprintf(", %ld, ", tcp->u_arg[2]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprintf(", ");
+               printxval(epollctls, tcp->u_arg[1], "EPOLL_CTL_???");
+               tprintf(", ");
+               printfd(tcp, tcp->u_arg[2]);
+               tprintf(", ");
                if (tcp->u_arg[3] == 0)
                        tprintf("NULL");
                else {
@@ -674,42 +730,67 @@ struct tcb *tcp;
        return 0;
 }
 
-int
-sys_epoll_wait(tcp)
-struct tcb *tcp;
+static void
+epoll_wait_common(struct tcb *tcp)
 {
-       if (entering(tcp))
-               tprintf("%ld, ", tcp->u_arg[0]);
-       else {
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprintf(", ");
+       } else {
                if (syserror(tcp))
                        tprintf("%lx", tcp->u_arg[1]);
                else if (tcp->u_rval == 0)
                        tprintf("{}");
                else {
 #ifdef HAVE_SYS_EPOLL_H
-                       struct epoll_event evs[tcp->u_rval];
-                       if (umove(tcp, tcp->u_arg[1], evs) == 0) {
-                               unsigned long i;
-                               tprintf("{");
-                               for (i = 0; i < tcp->u_rval; ++i) {
-                                       if (i > 0)
-                                               tprintf(", ");
-                                       print_epoll_event(&evs[i]);
+                       struct epoll_event ev, *start, *cur, *end;
+                       int failed = 0;
+
+                       tprintf("{");
+                       start = (struct epoll_event *) tcp->u_arg[1];
+                       end = start + tcp->u_rval;
+                       for (cur = start; cur < end; ++cur) {
+                               if (cur > start)
+                                       tprintf(", ");
+                               if (umove(tcp, (long) cur, &ev) == 0)
+                                       print_epoll_event(&ev);
+                               else {
+                                       tprintf("?");
+                                       failed = 1;
+                                       break;
                                }
-                               tprintf("}");
                        }
-                       else
+                       tprintf("}");
+                       if (failed)
+                               tprintf(" %#lx", (long) start);
+#else
+                       tprintf("{...}");
 #endif
-                               tprintf("{...}");
                }
                tprintf(", %ld, %ld", tcp->u_arg[2], 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)) {
+               tprintf(", ");
+               print_sigset(tcp, tcp->u_arg[4], 0);
+       }
        return 0;
 }
 
 int
-sys_io_setup(tcp)
-struct tcb *tcp;
+sys_io_setup(struct tcb *tcp)
 {
        if (entering(tcp))
                tprintf("%ld, ", tcp->u_arg[0]);
@@ -728,17 +809,65 @@ struct tcb *tcp;
 }
 
 int
-sys_io_destroy(tcp)
-struct tcb *tcp;
+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 const char *
+iocb_cmd_lookup(unsigned cmd, enum iocb_sub *sub)
+{
+       static char buf[sizeof("%u /* SUB_??? */") + sizeof(int)*3];
+       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)) {
+               *sub = cmds[cmd].sub;
+               return cmds[cmd].name;
+       }
+       *sub = SUB_NONE;
+       sprintf(buf, "%u /* SUB_??? */", cmd);
+       return buf;
+}
+
+/* Not defined in libaio.h */
+#ifndef IOCB_RESFD
+# define IOCB_RESFD (1 << 0)
+#endif
+
+static void
+print_common_flags(struct iocb *iocb)
+{
+       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);
+}
+
+#endif /* HAVE_LIBAIO_H */
+
 int
-sys_io_submit(tcp)
-struct tcb *tcp;
+sys_io_submit(struct tcb *tcp)
 {
        long nr;
        if (entering(tcp)) {
@@ -753,6 +882,7 @@ struct tcb *tcp;
                        struct iocb *iocbp, **iocbs = (void *)tcp->u_arg[2];
 
                        for (i = 0; i < nr; i++, iocbs++) {
+                               enum iocb_sub sub;
                                struct iocb iocb;
                                if (i == 0)
                                        tprintf("{");
@@ -764,15 +894,49 @@ struct tcb *tcp;
                                        tprintf("{...}");
                                        continue;
                                }
-                               tprintf("{%p, %u, %hu, %hu, %d}",
-                                       iocb.data, iocb.key,
-                                       iocb.aio_lio_opcode,
-                                       iocb.aio_reqprio, iocb.aio_fildes);
+                               tprintf("{");
+                               if (iocb.data)
+                                       tprintf("data:%p, ", iocb.data);
+                               if (iocb.key)
+                                       tprintf("key:%u, ", iocb.key);
+                               tprintf("%s, ", iocb_cmd_lookup(iocb.aio_lio_opcode, &sub));
+                               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) {
+                                               tprintf(", 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:%llx",
+                                               iocb.u.c.nbytes,
+                                               iocb.u.c.offset);
+                                       print_common_flags(&iocb);
+                                       break;
+                               case SUB_VECTOR:
+                                       tprintf(", %llx, ", iocb.u.v.offset);
+                                       print_common_flags(&iocb);
+                                       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;
+                               }
+                               tprintf("}");
                        }
                        if (i)
                                tprintf("}");
 #else
-                       tprintf("{...}");
+#warning "libaio-devel is not available => no io_submit decoding"
+                       tprintf("%#lx", tcp->u_arg[2]);
 #endif
                }
        }
@@ -780,8 +944,7 @@ struct tcb *tcp;
 }
 
 int
-sys_io_cancel(tcp)
-struct tcb *tcp;
+sys_io_cancel(struct tcb *tcp)
 {
        if (entering(tcp)) {
 #ifdef HAVE_LIBAIO_H
@@ -807,7 +970,7 @@ struct tcb *tcp;
                                tprintf("{%p, %p, %ld, %ld}",
                                        event.data, event.obj,
                                        event.res, event.res2);
-                       else 
+                       else
 #endif
                                tprintf("{...}");
                }
@@ -816,8 +979,7 @@ struct tcb *tcp;
 }
 
 int
-sys_io_getevents(tcp)
-struct tcb *tcp;
+sys_io_getevents(struct tcb *tcp)
 {
        if (entering(tcp)) {
                tprintf("%ld, %ld, %ld, ", tcp->u_arg[0], tcp->u_arg[1],
@@ -851,24 +1013,64 @@ struct tcb *tcp;
 #endif
                }
 
-               if (tcp->u_arg[4] == 0)
-                       tprintf("NULL");
+               print_timespec(tcp, tcp->u_arg[4]);
+       }
+       return 0;
+}
+#endif /* LINUX */
+
+int
+sys_select(struct tcb *tcp)
+{
+       return decode_select(tcp, tcp->u_arg, BITNESS_CURRENT);
+}
+
+#ifdef LINUX
+int
+sys_pselect6(struct tcb *tcp)
+{
+       int rc = decode_select(tcp, tcp->u_arg, BITNESS_CURRENT);
+       if (entering(tcp)) {
+               struct {
+                       void *ss;
+                       unsigned long len;
+               } data;
+               if (umove(tcp, tcp->u_arg[5], &data) < 0)
+                       tprintf(", %#lx", tcp->u_arg[5]);
                else {
-                       struct timespec to;
-                       if (umove(tcp, tcp->u_arg[4], &to) == 0)
-                               tprintf("{%lu, %lu}", to.tv_sec, to.tv_nsec);
+                       tprintf(", {");
+                       if (data.len < sizeof(long))
+                               tprintf("%#lx", (long)data.ss);
                        else
-                               tprintf("{...}");
+                               print_sigset(tcp, (long)data.ss, 0);
+                       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) {
+                       tprintf(", ");
+                       printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
                }
        }
        return 0;
 }
-#endif /* LINUX */
 
 int
-sys_select(tcp)
-struct tcb *tcp;
+sys_eventfd(struct tcb *tcp)
 {
-       long *args = tcp->u_arg;
-       return decode_select(tcp, args, 0);
+       return do_eventfd(tcp, -1);
 }
+
+int
+sys_eventfd2(struct tcb *tcp)
+{
+       return do_eventfd(tcp, 1);
+}
+#endif