]> granicus.if.org Git - strace/blobdiff - desc.c
io.c: use printaddr and umove_or_printaddr
[strace] / desc.c
diff --git a/desc.c b/desc.c
index a180f8877b3ee3d6944614072735df4ae11803e7..e1d01dc4e9d822a1c810a73f7f1e6471849fd5fb 100644 (file)
--- a/desc.c
+++ b/desc.c
 # include  <linux/perf_event.h>
 #endif
 
-static const struct xlat fcntlcmds[] = {
-       XLAT(F_DUPFD),
-       XLAT(F_GETFD),
-       XLAT(F_SETFD),
-       XLAT(F_GETFL),
-       XLAT(F_SETFL),
-       XLAT(F_GETLK),
-       XLAT(F_SETLK),
-       XLAT(F_SETLKW),
-       XLAT(F_GETOWN),
-       XLAT(F_SETOWN),
-#ifdef F_RSETLK
-       XLAT(F_RSETLK),
-#endif
-#ifdef F_RSETLKW
-       XLAT(F_RSETLKW),
-#endif
-#ifdef F_RGETLK
-       XLAT(F_RGETLK),
-#endif
-#ifdef F_CNVT
-       XLAT(F_CNVT),
-#endif
-#ifdef F_SETSIG
-       XLAT(F_SETSIG),
-#endif
-#ifdef F_GETSIG
-       XLAT(F_GETSIG),
-#endif
-#ifdef F_CHKFL
-       XLAT(F_CHKFL),
-#endif
-#ifdef F_DUP2FD
-       XLAT(F_DUP2FD),
-#endif
-#ifdef F_ALLOCSP
-       XLAT(F_ALLOCSP),
-#endif
-#ifdef F_ISSTREAM
-       XLAT(F_ISSTREAM),
-#endif
-#ifdef F_PRIV
-       XLAT(F_PRIV),
-#endif
-#ifdef F_NPRIV
-       XLAT(F_NPRIV),
-#endif
-#ifdef F_QUOTACL
-       XLAT(F_QUOTACL),
-#endif
-#ifdef F_BLOCKS
-       XLAT(F_BLOCKS),
-#endif
-#ifdef F_BLKSIZE
-       XLAT(F_BLKSIZE),
-#endif
-#ifdef F_GETOWN
-       XLAT(F_GETOWN),
-#endif
-#ifdef F_SETOWN
-       XLAT(F_SETOWN),
-#endif
-#ifdef F_REVOKE
-       XLAT(F_REVOKE),
-#endif
-#ifdef F_SETLK
-       XLAT(F_SETLK),
-#endif
-#ifdef F_SETLKW
-       XLAT(F_SETLKW),
-#endif
-#ifdef F_GETLK
-       XLAT(F_GETLK),
-#endif
-#ifdef F_SETLK64
-       XLAT(F_SETLK64),
-#endif
-#ifdef F_SETLKW64
-       XLAT(F_SETLKW64),
-#endif
-#ifdef F_GETLK64
-       XLAT(F_GETLK64),
-#endif
-#ifdef F_SHARE
-       XLAT(F_SHARE),
-#endif
-#ifdef F_UNSHARE
-       XLAT(F_UNSHARE),
-#endif
-#ifdef F_SETLEASE
-       XLAT(F_SETLEASE),
-#endif
-#ifdef F_GETLEASE
-       XLAT(F_GETLEASE),
-#endif
-#ifdef F_NOTIFY
-       XLAT(F_NOTIFY),
-#endif
-#ifdef F_DUPFD_CLOEXEC
-       XLAT(F_DUPFD_CLOEXEC),
-#endif
-       XLAT_END
-};
-
-static const struct xlat fdflags[] = {
-#ifdef FD_CLOEXEC
-       XLAT(FD_CLOEXEC),
-#endif
-       XLAT_END
-};
-
-#ifdef LOCK_SH
-
-static const struct xlat flockcmds[] = {
-       XLAT(LOCK_SH),
-       XLAT(LOCK_EX),
-       XLAT(LOCK_NB),
-       XLAT(LOCK_UN),
-       XLAT_END
-};
-
-#endif /* LOCK_SH */
-
-static const struct xlat lockfcmds[] = {
-       XLAT(F_RDLCK),
-       XLAT(F_WRLCK),
-       XLAT(F_UNLCK),
-#ifdef F_EXLCK
-       XLAT(F_EXLCK),
-#endif
-#ifdef F_SHLCK
-       XLAT(F_SHLCK),
-#endif
-       XLAT_END
-};
-
-#ifdef F_NOTIFY
-static const struct xlat notifyflags[] = {
-#ifdef DN_ACCESS
-       XLAT(DN_ACCESS),
-#endif
-#ifdef DN_MODIFY
-       XLAT(DN_MODIFY),
-#endif
-#ifdef DN_CREATE
-       XLAT(DN_CREATE),
-#endif
-#ifdef DN_DELETE
-       XLAT(DN_DELETE),
-#endif
-#ifdef DN_RENAME
-       XLAT(DN_RENAME),
-#endif
-#ifdef DN_ATTRIB
-       XLAT(DN_ATTRIB),
-#endif
-#ifdef DN_MULTISHOT
-       XLAT(DN_MULTISHOT),
-#endif
-       XLAT_END
-};
-#endif
-
-static const struct xlat perf_event_open_flags[] = {
-#ifdef PERF_FLAG_FD_NO_GROUP
-       XLAT(PERF_FLAG_FD_NO_GROUP),
-#endif
-#ifdef PERF_FLAG_FD_OUTPUT
-       XLAT(PERF_FLAG_FD_OUTPUT),
-#endif
-#ifdef PERF_FLAG_PID_CGROUP
-       XLAT(PERF_FLAG_PID_CGROUP),
-#endif
-       XLAT_END
-};
+#include "xlat/fcntlcmds.h"
+#include "xlat/fdflags.h"
+#include "xlat/flockcmds.h"
+#include "xlat/lockfcmds.h"
+#include "xlat/notifyflags.h"
+#include "xlat/perf_event_open_flags.h"
 
 /*
  * Assume that F_SETLK64, F_SETLKW64, and F_GETLK64 are either defined
@@ -314,8 +145,7 @@ printflock(struct tcb *tcp, long addr, int getlk)
                tprints("}");
 }
 
-int
-sys_fcntl(struct tcb *tcp)
+SYS_FUNC(fcntl)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
@@ -413,8 +243,7 @@ sys_fcntl(struct tcb *tcp)
 
 #ifdef LOCK_SH
 
-int
-sys_flock(struct tcb *tcp)
+SYS_FUNC(flock)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
@@ -425,8 +254,7 @@ sys_flock(struct tcb *tcp)
 }
 #endif /* LOCK_SH */
 
-int
-sys_close(struct tcb *tcp)
+SYS_FUNC(close)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
@@ -434,6 +262,14 @@ sys_close(struct tcb *tcp)
        return 0;
 }
 
+SYS_FUNC(dup)
+{
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+       }
+       return RVAL_FD;
+}
+
 static int
 do_dup2(struct tcb *tcp, int flags_arg)
 {
@@ -446,24 +282,21 @@ do_dup2(struct tcb *tcp, int flags_arg)
                        printflags(open_mode_flags, tcp->u_arg[flags_arg], "O_???");
                }
        }
-       return 0;
+       return 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)
+SYS_FUNC(getdtablesize)
 {
        return 0;
 }
@@ -474,7 +307,7 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
 {
        int i, j;
        int nfds, fdsize;
-       fd_set *fds;
+       fd_set *fds = NULL;
        const char *sep;
        long arg;
 
@@ -482,10 +315,9 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
        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;
@@ -499,22 +331,19 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
        if (entering(tcp)) {
                tprintf("%d", (int) args[0]);
 
-               if (fdsize > 0) {
-                       fds = malloc(fdsize);
-                       if (!fds)
-                               die_out_of_memory();
-               }
+               if (verbose(tcp) && fdsize > 0)
+                       fds = xmalloc(fdsize);
                for (i = 0; i < 3; i++) {
                        arg = args[i+1];
                        if (arg == 0) {
                                tprints(", NULL");
                                continue;
                        }
-                       if (!verbose(tcp) || !fds) {
+                       if (!fds) {
                                tprintf(", %#lx", arg);
                                continue;
                        }
-                       if (umoven(tcp, arg, fdsize, (char *) fds) < 0) {
+                       if (umoven(tcp, arg, fdsize, fds) < 0) {
                                tprints(", [?]");
                                continue;
                        }
@@ -548,9 +377,7 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                        return RVAL_STR;
                }
 
-               fds = malloc(fdsize);
-               if (!fds)
-                       die_out_of_memory();
+               fds = xmalloc(fdsize);
 
                outptr = outstr;
                sep = "";
@@ -558,7 +385,7 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                        int first = 1;
 
                        arg = args[i+1];
-                       if (!arg || umoven(tcp, arg, fdsize, (char *) fds) < 0)
+                       if (!arg || umoven(tcp, arg, fdsize, fds) < 0)
                                continue;
                        for (j = 0;; j++) {
                                j = next_set_bit(fds, j, nfds);
@@ -601,12 +428,11 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
        return 0;
 }
 
-int
-sys_oldselect(struct tcb *tcp)
+SYS_FUNC(oldselect)
 {
        long args[5];
 
-       if (umoven(tcp, tcp->u_arg[0], sizeof args, (char *) args) < 0) {
+       if (umoven(tcp, tcp->u_arg[0], sizeof args, args) < 0) {
                tprints("[...]");
                return 0;
        }
@@ -614,89 +440,24 @@ sys_oldselect(struct tcb *tcp)
 }
 
 #ifdef ALPHA
-int
-sys_osf_select(struct tcb *tcp)
+SYS_FUNC(osf_select)
 {
        long *args = tcp->u_arg;
        return decode_select(tcp, args, BITNESS_32);
 }
 #endif
 
-static const struct xlat epollctls[] = {
-#ifdef EPOLL_CTL_ADD
-       XLAT(EPOLL_CTL_ADD),
-#endif
-#ifdef EPOLL_CTL_MOD
-       XLAT(EPOLL_CTL_MOD),
-#endif
-#ifdef EPOLL_CTL_DEL
-       XLAT(EPOLL_CTL_DEL),
-#endif
-       XLAT_END
-};
-
-static const struct xlat epollevents[] = {
-#ifdef EPOLLIN
-       XLAT(EPOLLIN),
-#endif
-#ifdef EPOLLPRI
-       XLAT(EPOLLPRI),
-#endif
-#ifdef EPOLLOUT
-       XLAT(EPOLLOUT),
-#endif
-#ifdef EPOLLRDNORM
-       XLAT(EPOLLRDNORM),
-#endif
-#ifdef EPOLLRDBAND
-       XLAT(EPOLLRDBAND),
-#endif
-#ifdef EPOLLWRNORM
-       XLAT(EPOLLWRNORM),
-#endif
-#ifdef EPOLLWRBAND
-       XLAT(EPOLLWRBAND),
-#endif
-#ifdef EPOLLMSG
-       XLAT(EPOLLMSG),
-#endif
-#ifdef EPOLLERR
-       XLAT(EPOLLERR),
-#endif
-#ifdef EPOLLHUP
-       XLAT(EPOLLHUP),
-#endif
-#ifdef EPOLLRDHUP
-       XLAT(EPOLLRDHUP),
-#endif
-#ifdef EPOLLONESHOT
-       XLAT(EPOLLONESHOT),
-#endif
-#ifdef EPOLLET
-       XLAT(EPOLLET),
-#endif
-       XLAT_END
-};
+#include "xlat/epollctls.h"
+#include "xlat/epollevents.h"
+#include "xlat/epollflags.h"
 
 /* Not aliased to printargs_ld: we want it to have a distinct address */
-int
-sys_epoll_create(struct tcb *tcp)
+SYS_FUNC(epoll_create)
 {
        return printargs_ld(tcp);
 }
 
-static const struct xlat epollflags[] = {
-#ifdef EPOLL_CLOEXEC
-       XLAT(EPOLL_CLOEXEC),
-#endif
-#ifdef EPOLL_NONBLOCK
-       XLAT(EPOLL_NONBLOCK),
-#endif
-       XLAT_END
-};
-
-int
-sys_epoll_create1(struct tcb *tcp)
+SYS_FUNC(epoll_create1)
 {
        if (entering(tcp))
                printflags(epollflags, tcp->u_arg[0], "EPOLL_???");
@@ -716,8 +477,7 @@ print_epoll_event(struct epoll_event *ev)
 }
 #endif
 
-int
-sys_epoll_ctl(struct tcb *tcp)
+SYS_FUNC(epoll_ctl)
 {
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
@@ -786,15 +546,13 @@ epoll_wait_common(struct tcb *tcp)
        }
 }
 
-int
-sys_epoll_wait(struct tcb *tcp)
+SYS_FUNC(epoll_wait)
 {
        epoll_wait_common(tcp);
        return 0;
 }
 
-int
-sys_epoll_pwait(struct tcb *tcp)
+SYS_FUNC(epoll_pwait)
 {
        epoll_wait_common(tcp);
        if (exiting(tcp)) {
@@ -806,14 +564,12 @@ sys_epoll_pwait(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_select(struct tcb *tcp)
+SYS_FUNC(select)
 {
        return decode_select(tcp, tcp->u_arg, BITNESS_CURRENT);
 }
 
-int
-sys_pselect6(struct tcb *tcp)
+SYS_FUNC(pselect6)
 {
        int rc = decode_select(tcp, tcp->u_arg, BITNESS_CURRENT);
        if (entering(tcp)) {
@@ -859,20 +615,17 @@ do_eventfd(struct tcb *tcp, int flags_arg)
        return 0;
 }
 
-int
-sys_eventfd(struct tcb *tcp)
+SYS_FUNC(eventfd)
 {
        return do_eventfd(tcp, -1);
 }
 
-int
-sys_eventfd2(struct tcb *tcp)
+SYS_FUNC(eventfd2)
 {
        return do_eventfd(tcp, 1);
 }
 
-int
-sys_perf_event_open(struct tcb *tcp)
+SYS_FUNC(perf_event_open)
 {
        if (entering(tcp)) {
                tprintf("%#lx, %d, %d, %d, ",