Fix decoding of file descriptors

[strace] / desc.c

diff --git a/desc.c b/desc.c
index 3aae9908472037c3ca75ade6dd1412324d04db3c..790b10bb1e5cbfc1c508dfaf17756e60d0f7c7ac 100644 (file)
--- a/desc.c
+++ b/desc.c
@@ -236,34 +236,39 @@ printflock(struct tcb *tcp, long addr, int getlk)
 {
        struct flock fl;
 
-       if (personality_wordsize[current_personality] == sizeof(fl.l_start)) {
-               if (umove(tcp, addr, &fl) < 0) {
-                       tprintf("{...}");
+#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 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) {
+       } else
+#endif
+       {
+               if (umove(tcp, addr, &fl) < 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;
        }
        tprintf("{type=");
        printxval(lockfcmds, fl.l_type, "F_???");
@@ -304,7 +309,8 @@ int
 sys_fcntl(struct tcb *tcp)
 {
        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:
@@ -417,7 +423,8 @@ int
 sys_flock(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprintf(", ");
                printflags(flockcmds, tcp->u_arg[1], "LOCK_???");
        }
        return 0;
@@ -428,7 +435,7 @@ int
 sys_close(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
        }
        return 0;
 }
@@ -437,7 +444,7 @@ int
 sys_dup(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
        }
        return 0;
 }
@@ -446,7 +453,9 @@ 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_???");
@@ -485,7 +494,7 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                               & -sizeof(long));
        fd_set *fds;
        static char outstr[1024];
-       char *sep;
+       const char *sep;
        long arg;
 
        if (entering(tcp)) {
@@ -511,7 +520,8 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                        tprintf(", [");
                        for (j = 0, sep = ""; j < nfds; j++) {
                                if (FD_ISSET(j, fds)) {
-                                       tprintf("%s%u", sep, j);
+                                       tprintf("%s", sep);
+                                       printfd(tcp, j);
                                        sep = " ";
                                }
                        }
@@ -524,7 +534,7 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
        else
        {
                unsigned int cumlen = 0;
-               char *sep = "";
+               const char *sep = "";
 
                if (syserror(tcp))
                        return 0;
@@ -541,7 +551,6 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                outstr[0] = '\0';
                for (i = 0; i < 3; i++) {
                        int first = 1;
-                       char str[20];
 
                        tcp->auxstr = outstr;
                        arg = args[i+1];
@@ -550,6 +559,8 @@ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
                                continue;
                        for (j = 0; j < args[0]; j++) {
                                if (FD_ISSET(j, fds)) {
+                                       char str[11 + 3 * sizeof(int)];
+
                                        if (first) {
                                                sprintf(str, "%s%s [%u", sep,
                                                        i == 0 ? "in" :
@@ -697,9 +708,12 @@ int
 sys_epoll_ctl(struct tcb *tcp)
 {
        if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
+               printfd(tcp, tcp->u_arg[0]);
+               tprintf(", ");
                printxval(epollctls, tcp->u_arg[1], "EPOLL_CTL_???");
-               tprintf(", %ld, ", tcp->u_arg[2]);
+               tprintf(", ");
+               printfd(tcp, tcp->u_arg[2]);
+               tprintf(", ");
                if (tcp->u_arg[3] == 0)
                        tprintf("NULL");
                else {
@@ -718,9 +732,10 @@ sys_epoll_ctl(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)
@@ -766,8 +781,10 @@ int
 sys_epoll_pwait(struct tcb *tcp)
 {
        epoll_wait_common(tcp);
-       if (exiting(tcp))
+       if (exiting(tcp)) {
+               tprintf(", ");
                print_sigset(tcp, tcp->u_arg[4], 0);
+       }
        return 0;
 }