aboutsummaryrefslogtreecommitdiffstats
path: root/ftp.c
diff options
context:
space:
mode:
authorFumitoshi UKAI <ukai@debian.or.jp>2003-10-22 18:44:30 +0000
committerFumitoshi UKAI <ukai@debian.or.jp>2003-10-22 18:44:30 +0000
commit4028a343d563df2b04c9bbef4287c1bddcb13def (patch)
tree9648399df85a5adee970ae3ee8593d1a47c312be /ftp.c
parent[w3m-dev 04009] ./configure --disable-image problem (diff)
downloadw3m-4028a343d563df2b04c9bbef4287c1bddcb13def.tar.gz
w3m-4028a343d563df2b04c9bbef4287c1bddcb13def.zip
[w3m-dev 04010] support for deprecated __ss_family
* acinclude.m4 (AC_W3M_IPv6): check __ss_family * config.h.in: add HAVE_OLD_SS_FAMILY * ftp.c (ftp_pasv): ifdef HAVE_OLD_SS_FAMILY From: ABE Yuji <cbo46560@pop12.odn.ne.jp>
Diffstat (limited to 'ftp.c')
-rw-r--r--ftp.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ftp.c b/ftp.c
index 5928d8d..22700f7 100644
--- a/ftp.c
+++ b/ftp.c
@@ -1,4 +1,4 @@
-/* $Id: ftp.c,v 1.33 2003/10/05 18:52:51 ukai Exp $ */
+/* $Id: ftp.c,v 1.34 2003/10/22 18:44:31 ukai Exp $ */
#include <stdio.h>
#include <pwd.h>
#include <Str.h>
@@ -196,7 +196,11 @@ ftp_pasv(FTP ftp)
if (getpeername(fileno(ftp->wf),
(struct sockaddr *)&sockaddr, &sockaddrlen) < 0)
return -1;
+#ifdef HAVE_OLD_SS_FAMILY
+ family = sockaddr.__ss_family;
+#else
family = sockaddr.ss_family;
+#endif
#else
family = AF_INET;
#endif