On Tue, Dec 16, 2003 at 04:31:16PM +0300, Alexander V. Lukyanov wrote:
> On Tue, Dec 16, 2003 at 06:18:15AM -0600, Albert Chin wrote:
> > How about lftp_socklen_t instead of socktype_t?
>
> That's ok.
Ok, patch to use lftp_socklen_t below.
--
albert chin ([EMAIL PROTECTED])
-- snip snip
--- src/ftpclass.cc.orig 2003-12-14 17:38:04.000000000 -0600
+++ src/ftpclass.cc 2003-12-16 11:45:52.475331000 -0600
@@ -111,7 +111,7 @@
if(sock==-1)
return;
int avail=-1;
- socklen_t len=sizeof(avail);
+ lftp_socklen_t len=sizeof(avail);
if(getsockopt(sock,SOL_SOCKET,SO_SNDBUF,(char*)&avail,&len)==-1)
avail=-1;
int buf=-1;
@@ -191,7 +191,7 @@
{
sockaddr_u d;
sockaddr_u c;
- socklen_t len;
+ lftp_socklen_t len;
len=sizeof(d);
if(dp)
d=*dp;
@@ -744,7 +744,7 @@
return 0;
}
- socklen_t len=sizeof(data_sa);
+ lftp_socklen_t len=sizeof(data_sa);
getpeername(control_sock,&data_sa.sa,&len);
if(data_sa.sa.sa_family==AF_INET)
data_sa.in.sin_port=htons(port);
@@ -1120,7 +1120,7 @@
const char *command=0;
bool append_file=false;
int res;
- socklen_t addr_len;
+ lftp_socklen_t addr_len;
unsigned char *a;
unsigned char *p;
automate_state oldstate;
@@ -4108,7 +4108,7 @@
int buffer=0;
if(TIOCOUTQ_returns_free_space)
{
- socklen_t len=sizeof(buffer);
+ lftp_socklen_t len=sizeof(buffer);
if(getsockopt(data_sock,SOL_SOCKET,SO_SNDBUF,(char*)&buffer,&len)==-1)
return 0;
int avail=buffer;
--- src/NetAccess.h.orig 2003-12-14 17:38:38.000000000 -0600
+++ src/NetAccess.h 2003-12-16 11:45:05.210178000 -0600
@@ -67,7 +67,7 @@
static const char *SocketNumericAddress(const sockaddr_u *u);
static int SocketPort(const sockaddr_u *u);
- static socklen_t SocketAddrLen(const sockaddr_u *u);
+ static lftp_socklen_t SocketAddrLen(const sockaddr_u *u);
static int SocketConnect(int fd,const sockaddr_u *u);
int SocketCreate(int,int,int);
int SocketCreateTCP(int);
--- src/NetAccess.cc.orig 2003-12-14 17:38:53.000000000 -0600
+++ src/NetAccess.cc 2003-12-16 11:45:21.600506000 -0600
@@ -184,7 +185,7 @@
return 0;
}
-socklen_t NetAccess::SocketAddrLen(const sockaddr_u *u)
+lftp_socklen_t NetAccess::SocketAddrLen(const sockaddr_u *u)
{
if(u->sa.sa_family==AF_INET)
return sizeof(u->in);
--- src/FileAccess.cc.orig 2003-12-14 17:40:00.000000000 -0600
+++ src/FileAccess.cc 2003-12-16 11:45:11.200977000 -0600
@@ -208,7 +208,7 @@
#ifdef SO_ERROR
char str[256];
int s_errno=0;
- socklen_t len;
+ lftp_socklen_t len;
errno=0;
--- m4/socklen.m4.orig 2003-12-14 16:07:37.000000000 -0600
+++ m4/socklen.m4 2003-12-16 11:44:29.494493000 -0600
@@ -16,12 +16,13 @@
],
[
lftp_cv_socklen_t=yes
+ lftp_cv_socklen_t_equiv=socklen_t
])
AC_LANG_POP(C++)
])
AC_MSG_RESULT($lftp_cv_socklen_t)
if test $lftp_cv_socklen_t = no; then
- AC_MSG_CHECKING(for socklen_t equivalent)
+ AC_MSG_CHECKING([for socklen_t equivalent for socket functions])
AC_CACHE_VAL(lftp_cv_socklen_t_equiv,
[
lftp_cv_socklen_t_equiv=int
@@ -43,7 +44,7 @@
AC_LANG_POP(C++)
])
AC_MSG_RESULT($lftp_cv_socklen_t_equiv)
- AC_DEFINE_UNQUOTED(socklen_t, $lftp_cv_socklen_t_equiv,
- [type to use in place of socklen_t if not defined])
fi
+ AC_DEFINE_UNQUOTED(lftp_socklen_t, $lftp_cv_socklen_t_equiv,
+ [type to use in place of socklen_t if not defined])
])
