commit 63411dbde5aa6faeee64cfab9af35c4a74b6dc4d
author Alexandre Julliard <julliard@winehq.org> Fri Dec 22 21:12:36 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 22 21:12:36 2000 +0000
tree c14d679cb53307d8ff418ab0619f4fc0d0182d47
parent 2930b9c461e49d27318d72a5aa6452f9b1f2b59d

Avoid dup'ing file descriptors when not necessary.
Do not send fd to the client if ops->get_fd() fails.

server/request.c

diff --git a/server/request.c b/server/request.c
index fff02dd4..7a8498b 100644
--- a/server/request.c
+++ b/server/request.c
@@ -259,6 +259,9 @@
 {
     int ret;
 
+    if (debug_level)
+        fprintf( stderr, "%08x: *fd* %d = %d\n", (unsigned int)thread, handle, fd );
+
 #ifdef HAVE_MSGHDR_ACCRIGHTS
     msghdr.msg_accrightslen = sizeof(fd);
     msghdr.msg_accrights = (void *)&fd;
@@ -272,7 +275,6 @@
     myiovec.iov_len  = sizeof(handle);
 
     ret = sendmsg( thread->obj.fd, &msghdr, 0 );
-    close( fd );
 
     if (ret > 0) return 0;
     if (errno == EPIPE)
@@ -381,6 +383,7 @@
     }
     sock->thread = thread;
     send_client_fd( thread, fd[1], -1 );
+    close( fd[1] );
     set_select_events( &sock->obj, POLLIN );
     return &sock->obj;
 }