From 88b4721025bdf1f0910b2eaa66f2066e8752b0a6 Mon Sep 17 00:00:00 2001
From: Ito Hiroyuki <ZXB01226@nifty.com>
Date: Tue, 10 Aug 2010 10:16:57 +0000
Subject: [w3m-dev 04379] check socklen_t

---
 ftp.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'ftp.c')

diff --git a/ftp.c b/ftp.c
index e3f8c2e..f419b16 100644
--- a/ftp.c
+++ b/ftp.c
@@ -1,4 +1,4 @@
-/* $Id: ftp.c,v 1.39 2007/05/31 01:19:50 inu Exp $ */
+/* $Id: ftp.c,v 1.40 2010/08/10 10:16:57 htrb Exp $ */
 #include <stdio.h>
 #ifndef __MINGW32_VERSION
 #include <pwd.h>
@@ -25,6 +25,10 @@
 #include <winsock.h>
 #endif /* __MINGW32_VERSION */
 
+#ifdef HAVE_SOCKLEN_T
+typedef int socklen_t;
+#endif
+
 typedef struct _FTP {
     char *host;
     int port;
@@ -128,7 +132,7 @@ ftp_login(FTP ftp)
 
 	if (n > 0 && ftp->pass[n - 1] == '@') {
 	    struct sockaddr_in sockname;
-	    int socknamelen = sizeof(sockname);
+	    socklen_t socknamelen = sizeof(sockname);
 
 	    if (!getsockname(sock, (struct sockaddr *)&sockname, &socknamelen)) {
 		struct hostent *sockent;
@@ -192,7 +196,8 @@ ftp_pasv(FTP ftp)
     int family;
 #ifdef INET6
     struct sockaddr_storage sockaddr;
-    int sockaddrlen, port;
+    int port;
+    socklen_t sockaddrlen;
     unsigned char d1, d2, d3, d4;
     char abuf[INET6_ADDRSTRLEN];
 #endif
-- 
cgit v1.2.3