From 8e5f8a700569015bc36a84850c6d4b4bba5cd1ae Mon Sep 17 00:00:00 2001
From: David Sansome
Date: Sat, 25 Sep 2010 16:52:10 +0200
Subject: Use Winsock's closesocket() function instead of close() on Windows.

---
 libusbmuxd/sock_stuff.c | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

(limited to 'libusbmuxd/sock_stuff.c')

diff --git a/libusbmuxd/sock_stuff.c b/libusbmuxd/sock_stuff.c
index 302b53a..edc738e 100644
--- a/libusbmuxd/sock_stuff.c
+++ b/libusbmuxd/sock_stuff.c
@@ -85,13 +85,13 @@ int create_unix_socket(const char *filename)
 
 	if (bind(sock, (struct sockaddr *) &name, size) < 0) {
 		perror("bind");
-		close(sock);
+		close_socket(sock);
 		return -1;
 	}
 
 	if (listen(sock, 10) < 0) {
 		perror("listen");
-		close(sock);
+		close_socket(sock);
 		return -1;
 	}
 
@@ -134,7 +134,7 @@ int connect_unix_socket(const char *filename)
 			+ strlen(name.sun_path) + 1);
 
 	if (connect(sfd, (struct sockaddr *) &name, size) < 0) {
-		close(sfd);
+		close_socket(sfd);
 		if (verbose >= 2)
 			fprintf(stderr, "%s: connect: %s\n", __func__,
 					strerror(errno));
@@ -168,7 +168,7 @@ int create_socket(uint16_t port)
 
 	if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void*)&yes, sizeof(int)) == -1) {
 		perror("setsockopt()");
-		close(sfd);
+		close_socket(sfd);
 		return -1;
 	}
 
@@ -179,13 +179,13 @@ int create_socket(uint16_t port)
 
 	if (0 > bind(sfd, (struct sockaddr *) &saddr, sizeof(saddr))) {
 		perror("bind()");
-		close(sfd);
+		close_socket(sfd);
 		return -1;
 	}
 
 	if (listen(sfd, 1) == -1) {
 		perror("listen()");
-		close(sfd);
+		close_socket(sfd);
 		return -1;
 	}
 
@@ -235,7 +235,7 @@ int connect_socket(const char *addr, uint16_t port)
 
 	if (setsockopt(sfd, SOL_SOCKET, SO_REUSEADDR, (void*)&yes, sizeof(int)) == -1) {
 		perror("setsockopt()");
-		close(sfd);
+		close_socket(sfd);
 		return -1;
 	}
 
@@ -246,7 +246,7 @@ int connect_socket(const char *addr, uint16_t port)
 
 	if (connect(sfd, (struct sockaddr *) &saddr, sizeof(saddr)) < 0) {
 		perror("connect");
-		close(sfd);
+		close_socket(sfd);
 		return -2;
 	}
 
@@ -321,6 +321,14 @@ int check_fd(int fd, fd_mode fdm, unsigned int timeout)
 	return sret;
 }
 
+int close_socket(int fd) {
+#ifdef WIN32
+	return closesocket(fd);
+#else
+	return close(fd);
+#endif
+}
+
 int recv_buf(int fd, void *data, size_t length)
 {
 	return recv_buf_timeout(fd, data, length, 0, RECV_TIMEOUT);
-- 
cgit v1.1-32-gdbae