glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pipe, pipe2, socketpair: print returned descriptors using printfd

Browse Source 
* net.c (printpair_fd, decode_pair_fd): New functions.
(do_pipe, sys_socketpair): Use them.
This commit is contained in:
Дмитрий Левин 2015-08-02 01:54:48 +00:00
parent 3d463be47e
commit 2a4f0521fc
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net.c
View File

@ -920,6 +920,27 @@ SYS_FUNC(getsockname)
return do_sockname(tcp, -1);
}
static void
printpair_fd(struct tcb *tcp, const int i0, const int i1)
{
tprints("[");
printfd(tcp, i0);
tprints(", ");
printfd(tcp, i1);
tprints("]");
}
static void
decode_pair_fd(struct tcb *tcp, const long addr)
{
int pair[2];
if (umove_or_printaddr(tcp, addr, &pair))
return;
printpair_fd(tcp, pair[0], pair[1]);
}
static int
do_pipe(struct tcb *tcp, int flags_arg)
{
@ -928,11 +949,11 @@ do_pipe(struct tcb *tcp, int flags_arg)
printaddr(tcp->u_arg[0]);
} else {
#ifdef HAVE_GETRVAL2
if (flags_arg < 0)
tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
else
if (flags_arg < 0) {
printpair_fd(tcp, tcp->u_rval, getrval2(tcp));
} else
#endif
printpair_int(tcp, tcp->u_arg[0], "%u");
decode_pair_fd(tcp, tcp->u_arg[0]);
}
if (flags_arg >= 0) {
tprints(", ");
@ -961,7 +982,7 @@ SYS_FUNC(socketpair)
tprintf(", %lu", tcp->u_arg[2]);
} else {
tprints(", ");
printpair_int(tcp, tcp->u_arg[3], "%u");
decode_pair_fd(tcp, tcp->u_arg[3]);
}
return 0;
}