From 1e7528c2b1a027538b54bd3576eba1206265ae8c Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 16 Aug 2016 11:04:43 +0200 Subject: swrap: Improve vfcntl to add the dup'd fd after the source fd Pair-Programmed-With: Stefan Metzmacher Signed-off-by: Michael Adam Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider --- src/socket_wrapper.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 730e346..b7de67c 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -5263,17 +5263,17 @@ int dup2(int fd, int newfd) static int swrap_vfcntl(int fd, int cmd, va_list va) { - struct socket_info_fd *fi; + struct socket_info_fd *src_fi, *fi; struct socket_info *si; int rc; - si = find_socket_info(fd); - if (si == NULL) { - rc = libc_vfcntl(fd, cmd, va); - - return rc; + src_fi = find_socket_info_fd(fd); + if (src_fi == NULL) { + return libc_vfcntl(fd, cmd, va); } + si = src_fi->si; + switch (cmd) { case F_DUPFD: fi = (struct socket_info_fd *)calloc(1, sizeof(struct socket_info_fd)); @@ -5296,7 +5296,7 @@ static int swrap_vfcntl(int fd, int cmd, va_list va) /* Make sure we don't have an entry for the fd */ swrap_remove_stale(fi->fd); - SWRAP_DLIST_ADD(socket_fds, fi); + SWRAP_DLIST_ADD_AFTER(socket_fds, fi, src_fi); rc = fi->fd; break; -- cgit