[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>
This commit is contained in:
Fumitoshi UKAI
14
ChangeLog
14
ChangeLog
@@ -1,3 +1,15 @@
|
||||
2003-10-23 ABE Yuji <cbo46560@pop12.odn.ne.jp>
|
||||
|
||||
* [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
|
||||
|
||||
2003-10-23 ABE Yuji <cbo46560@pop12.odn.ne.jp>
|
||||
|
||||
* [w3m-dev 04009] ./configure --disable-image problem
|
||||
* file.c (loadHTMLstream): if defined(USE_M17N)
|
||||
|
||||
2003-10-22 Fumitoshi UKAI <ukai@debian.or.jp>
|
||||
|
||||
* [w3m-dev 04006] checking GC_version for libgc
|
||||
@@ -8237,4 +8249,4 @@ a * [w3m-dev 03276] compile error on EWS4800
|
||||
* release-0-2-1
|
||||
* import w3m-0.2.1
|
||||
|
||||
$Id: ChangeLog,v 1.888 2003/10/21 17:12:09 ukai Exp $
|
||||
$Id: ChangeLog,v 1.889 2003/10/22 18:44:30 ukai Exp $
|
||||
|
||||
33
acinclude.m4
33
acinclude.m4
@@ -751,7 +751,7 @@ if test x"$enable_ipv6" = xyes; then
|
||||
AC_MSG_CHECKING(if IPv6 API available)
|
||||
AC_SUBST(INET6)
|
||||
AC_CHECK_FUNC(getaddrinfo,
|
||||
[enable_ipv6="yes"; AC_DEFINE(INET6)],
|
||||
[enable_ipv6="yes"],
|
||||
[enable_ipv6="no"])
|
||||
if test x"$enable_ipv6" = xno; then
|
||||
AC_MSG_CHECKING(for libinet6)
|
||||
@@ -762,13 +762,42 @@ if test x"$enable_ipv6" = xyes; then
|
||||
W3M_LIBS="$W3M_LIBS -L$dir"
|
||||
fi
|
||||
AC_CHECK_LIB(inet6, getaddrinfo,
|
||||
[enable_ipv6="yes"; AC_DEFINE(INET6)
|
||||
[enable_ipv6="yes"
|
||||
use_libinet6="found"; W3M_LIBS="$W3M_LIBS -linet6"; break],
|
||||
[use_libinet6="not found"])
|
||||
fi
|
||||
done
|
||||
AC_MSG_RESULT($use_libinet6)
|
||||
fi
|
||||
if test x"$enable_ipv6" = xyes; then
|
||||
AC_SUBST(HAVE_OLD_SS_FAMILY)
|
||||
AC_MSG_CHECKING(if struct sockaddr_storage has an ss_family member)
|
||||
AC_TRY_COMPILE([
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
], [
|
||||
struct sockaddr_storage ss;
|
||||
int i = ss.ss_family;
|
||||
],
|
||||
[AC_MSG_RESULT(yes)],
|
||||
[AC_TRY_COMPILE([
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
],
|
||||
[
|
||||
struct sockaddr_storage ss;
|
||||
int i = ss.__ss_family;
|
||||
],
|
||||
[AC_MSG_RESULT(no, but __ss_family exists)
|
||||
AC_DEFINE(HAVE_OLD_SS_FAMILY)],
|
||||
[AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN(IPv6 support is disabled)
|
||||
enable_ipv6="no"])
|
||||
])
|
||||
fi
|
||||
if test x"$enable_ipv6" = xyes; then
|
||||
AC_DEFINE(INET6)
|
||||
fi
|
||||
fi])
|
||||
#
|
||||
# ----------------------------------------------------------------
|
||||
|
||||
33
aclocal.m4
vendored
33
aclocal.m4
vendored
@@ -763,7 +763,7 @@ if test x"$enable_ipv6" = xyes; then
|
||||
AC_MSG_CHECKING(if IPv6 API available)
|
||||
AC_SUBST(INET6)
|
||||
AC_CHECK_FUNC(getaddrinfo,
|
||||
[enable_ipv6="yes"; AC_DEFINE(INET6)],
|
||||
[enable_ipv6="yes"],
|
||||
[enable_ipv6="no"])
|
||||
if test x"$enable_ipv6" = xno; then
|
||||
AC_MSG_CHECKING(for libinet6)
|
||||
@@ -774,13 +774,42 @@ if test x"$enable_ipv6" = xyes; then
|
||||
W3M_LIBS="$W3M_LIBS -L$dir"
|
||||
fi
|
||||
AC_CHECK_LIB(inet6, getaddrinfo,
|
||||
[enable_ipv6="yes"; AC_DEFINE(INET6)
|
||||
[enable_ipv6="yes"
|
||||
use_libinet6="found"; W3M_LIBS="$W3M_LIBS -linet6"; break],
|
||||
[use_libinet6="not found"])
|
||||
fi
|
||||
done
|
||||
AC_MSG_RESULT($use_libinet6)
|
||||
fi
|
||||
if test x"$enable_ipv6" = xyes; then
|
||||
AC_SUBST(HAVE_OLD_SS_FAMILY)
|
||||
AC_MSG_CHECKING(if struct sockaddr_storage has an ss_family member)
|
||||
AC_TRY_COMPILE([
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
], [
|
||||
struct sockaddr_storage ss;
|
||||
int i = ss.ss_family;
|
||||
],
|
||||
[AC_MSG_RESULT(yes)],
|
||||
[AC_TRY_COMPILE([
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
],
|
||||
[
|
||||
struct sockaddr_storage ss;
|
||||
int i = ss.__ss_family;
|
||||
],
|
||||
[AC_MSG_RESULT(no, but __ss_family exists)
|
||||
AC_DEFINE(HAVE_OLD_SS_FAMILY)],
|
||||
[AC_MSG_RESULT(no)
|
||||
AC_MSG_WARN(IPv6 support is disabled)
|
||||
enable_ipv6="no"])
|
||||
])
|
||||
fi
|
||||
if test x"$enable_ipv6" = xyes; then
|
||||
AC_DEFINE(INET6)
|
||||
fi
|
||||
fi])
|
||||
#
|
||||
# ----------------------------------------------------------------
|
||||
|
||||
@@ -80,6 +80,7 @@
|
||||
#define ID_EXT
|
||||
#undef CLEAR_BUF
|
||||
#undef INET6
|
||||
#undef HAVE_OLD_SS_FAMILY
|
||||
#define USE_EGD
|
||||
#define ENABLE_REMOVE_TRAILINGSPACES
|
||||
#undef MENU_THIN_FRAME
|
||||
|
||||
118
configure
vendored
118
configure
vendored
@@ -309,7 +309,7 @@ ac_includes_default="\
|
||||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION W3M W3M_LANG AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB PERL NKF MAN build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os W3M_TARGET W3M_LIBS USE_M17N USE_UNICODE WCTARGET WCCFLAGS DISPLAY_CHARSET SYSTEM_CHARSET DOCUMENT_CHARSET POSUBST POLANG MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB INTLTARGET NLSTARGET USE_COLOR USE_ANSI_COLOR USE_BG_COLOR USE_IMAGE USE_W3MIMG_X11 USE_W3MIMG_FB W3MIMGDISPLAY_SETUID INSTALL_W3MIMGDISPLAY USE_GDKPIXBUF USE_IMLIB USE_IMLIB2 IMGTARGETS IMGOBJS IMGX11CFLAGS IMGX11LDFLAGS IMGFBCFLAGS IMGFBLDFLAGS USE_XFACE uncompface KEYMAP_FILE HELP_FILE KEYBIND USE_MENU USE_MOUSE USE_HISTORY USE_ALARM USE_COOKIE USE_DIGEST_AUTH USE_NNTP USE_GOPHER INET6 USE_DICT USE_HELP_CGI USE_EXTERNAL_URI_LOADER USE_W3MMAILER USE_MIGEMO DEF_MIGEMO_COMMAND DEF_EDITOR DEF_MAILER DEF_EXT_BROWSER USE_SSL USE_SSL_VERIFY PKG_CONFIG SSL_CFLAGS SSL_LIBS USE_W3M USE_SYSMOUSE AUXBIN_TARGETS EGREP USE_BINMODE_STREAM HAVE_SYS_ERRLIST HAVE_SIGSETJMP RETSIGTYPE SIGNAL_RETURN HELP_DIR RC_DIR DOCDIRS CURRENT_VERSION LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION W3M W3M_LANG AWK CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB PERL NKF MAN build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os W3M_TARGET W3M_LIBS USE_M17N USE_UNICODE WCTARGET WCCFLAGS DISPLAY_CHARSET SYSTEM_CHARSET DOCUMENT_CHARSET POSUBST POLANG MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB INTLTARGET NLSTARGET USE_COLOR USE_ANSI_COLOR USE_BG_COLOR USE_IMAGE USE_W3MIMG_X11 USE_W3MIMG_FB W3MIMGDISPLAY_SETUID INSTALL_W3MIMGDISPLAY USE_GDKPIXBUF USE_IMLIB USE_IMLIB2 IMGTARGETS IMGOBJS IMGX11CFLAGS IMGX11LDFLAGS IMGFBCFLAGS IMGFBLDFLAGS USE_XFACE uncompface KEYMAP_FILE HELP_FILE KEYBIND USE_MENU USE_MOUSE USE_HISTORY USE_ALARM USE_COOKIE USE_DIGEST_AUTH USE_NNTP USE_GOPHER INET6 HAVE_OLD_SS_FAMILY USE_DICT USE_HELP_CGI USE_EXTERNAL_URI_LOADER USE_W3MMAILER USE_MIGEMO DEF_MIGEMO_COMMAND DEF_EDITOR DEF_MAILER DEF_EXT_BROWSER USE_SSL USE_SSL_VERIFY PKG_CONFIG SSL_CFLAGS SSL_LIBS USE_W3M USE_SYSMOUSE AUXBIN_TARGETS EGREP USE_BINMODE_STREAM HAVE_SYS_ERRLIST HAVE_SIGSETJMP RETSIGTYPE SIGNAL_RETURN HELP_DIR RC_DIR DOCDIRS CURRENT_VERSION LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
@@ -5475,10 +5475,7 @@ fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
|
||||
echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
|
||||
if test $ac_cv_func_getaddrinfo = yes; then
|
||||
enable_ipv6="yes"; cat >>confdefs.h <<\_ACEOF
|
||||
#define INET6 1
|
||||
_ACEOF
|
||||
|
||||
enable_ipv6="yes"
|
||||
else
|
||||
enable_ipv6="no"
|
||||
fi
|
||||
@@ -5547,10 +5544,7 @@ fi
|
||||
echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getaddrinfo" >&5
|
||||
echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6
|
||||
if test $ac_cv_lib_inet6_getaddrinfo = yes; then
|
||||
enable_ipv6="yes"; cat >>confdefs.h <<\_ACEOF
|
||||
#define INET6 1
|
||||
_ACEOF
|
||||
|
||||
enable_ipv6="yes"
|
||||
use_libinet6="found"; W3M_LIBS="$W3M_LIBS -linet6"; break
|
||||
else
|
||||
use_libinet6="not found"
|
||||
@@ -5561,6 +5555,111 @@ fi
|
||||
echo "$as_me:$LINENO: result: $use_libinet6" >&5
|
||||
echo "${ECHO_T}$use_libinet6" >&6
|
||||
fi
|
||||
if test x"$enable_ipv6" = xyes; then
|
||||
|
||||
echo "$as_me:$LINENO: checking if struct sockaddr_storage has an ss_family member" >&5
|
||||
echo $ECHO_N "checking if struct sockaddr_storage has an ss_family member... $ECHO_C" >&6
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
struct sockaddr_storage ss;
|
||||
int i = ss.ss_family;
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line $LINENO "configure"
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
struct sockaddr_storage ss;
|
||||
int i = ss.__ss_family;
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
rm -f conftest.$ac_objext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); } &&
|
||||
{ ac_try='test -s conftest.$ac_objext'
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||
(eval $ac_try) 2>&5
|
||||
ac_status=$?
|
||||
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||
(exit $ac_status); }; }; then
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_OLD_SS_FAMILY 1
|
||||
_ACEOF
|
||||
|
||||
else
|
||||
echo "$as_me: failed program was:" >&5
|
||||
sed 's/^/| /' conftest.$ac_ext >&5
|
||||
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
{ echo "$as_me:$LINENO: WARNING: IPv6 support is disabled" >&5
|
||||
echo "$as_me: WARNING: IPv6 support is disabled" >&2;}
|
||||
enable_ipv6="no"
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
|
||||
fi
|
||||
rm -f conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
if test x"$enable_ipv6" = xyes; then
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define INET6 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -10018,6 +10117,7 @@ s,@USE_DIGEST_AUTH@,$USE_DIGEST_AUTH,;t t
|
||||
s,@USE_NNTP@,$USE_NNTP,;t t
|
||||
s,@USE_GOPHER@,$USE_GOPHER,;t t
|
||||
s,@INET6@,$INET6,;t t
|
||||
s,@HAVE_OLD_SS_FAMILY@,$HAVE_OLD_SS_FAMILY,;t t
|
||||
s,@USE_DICT@,$USE_DICT,;t t
|
||||
s,@USE_HELP_CGI@,$USE_HELP_CGI,;t t
|
||||
s,@USE_EXTERNAL_URI_LOADER@,$USE_EXTERNAL_URI_LOADER,;t t
|
||||
|
||||
6
ftp.c
6
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
|
||||
|
||||
Reference in New Issue
Block a user