From ebe5f15854866c225febe73c952356873b958305 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 16 Aug 2016 11:03:27 +0200 Subject: swrap: Improve dup 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c index 2a88dff..110d999 100644 --- a/src/socket_wrapper.c +++ b/src/socket_wrapper.c @@ -5158,14 +5158,15 @@ int close(int fd) static int swrap_dup(int fd) { struct socket_info *si; - struct socket_info_fd *fi; - - si = find_socket_info(fd); + struct socket_info_fd *src_fi, *fi; - if (!si) { + src_fi = find_socket_info_fd(fd); + if (src_fi == NULL) { return libc_dup(fd); } + si = src_fi->si; + fi = (struct socket_info_fd *)calloc(1, sizeof(struct socket_info_fd)); if (fi == NULL) { errno = ENOMEM; @@ -5186,7 +5187,7 @@ static int swrap_dup(int fd) /* 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); return fi->fd; } -- cgit