The patch looks fine. If you want, I can install it. Cheers, Giuseppe
Guillem Jover <[email protected]> writes: > * ftp/ftp.c (hookup, initconn): Change `len' type from size_t to socklen_t. > (dataconn): Change `fromlen' type from size_t to socklen_t. > * ftpd/server_mode.c (server_mode): Change `addrlen' type from size_t to > socklen_t. > * ping/libping.c (ping_recv): Change `fromlen' type from size_t to socklen_t. > * rexecd/rexecd.c (main): Likewise. > * rlogind/rlogind.c (rlogin_daemon, rlogind_mainloop): Change `size' type > from size_t to socklen_t. > (rlogind_auth): Change `optsize' type from size_t to socklen_t. > * rshd/rshd.c (main): Change `fromlen' type from size_t to socklen_t. > (doit): Change `optsize' type from size_t to socklen_t. > * syslogd/syslogd.c (main): Change `len' type from size_t to socklen_t. > * talk/ctl.c (open_sockt, open_ctl): Change `length' type from size_t to > socklen_t. > * talkd/talkd.c (talkd_run): Change `len' type from size_t to socklen_t. > * tftp/tftp.c (send_file, recvfile): Change `fromlen' type from size_t to > socklen_t. > * tftpd/tftpd.c (fromlen): Likewise. > (main): Change `j' type from size_t to socklen_t. > --- > ftp/ftp.c | 6 +++--- > ftpd/server_mode.c | 2 +- > ping/libping.c | 2 +- > rexecd/rexecd.c | 2 +- > rlogind/rlogind.c | 6 +++--- > rshd/rshd.c | 4 ++-- > syslogd/syslogd.c | 2 +- > talk/ctl.c | 4 ++-- > talkd/talkd.c | 2 +- > tftp/tftp.c | 4 ++-- > tftpd/tftpd.c | 4 ++-- > 11 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/ftp/ftp.c b/ftp/ftp.c > index 4ed652d..9c3f5c8 100644 > --- a/ftp/ftp.c > +++ b/ftp/ftp.c > @@ -131,7 +131,7 @@ hookup (host, port) > { > struct hostent *hp = 0; > int s, tos; > - size_t len; > + socklen_t len; > static char hostnamebuf[80]; > > memset ((char *) &hisctladdr, 0, sizeof (hisctladdr)); > @@ -1155,7 +1155,7 @@ initconn () > { > char *p, *a; > int result, tmpno = 0; > - size_t len; > + socklen_t len; > int on = 1; > int a0, a1, a2, a3, p0, p1; > > @@ -1293,7 +1293,7 @@ dataconn (lmode) > { > struct sockaddr_in from; > int s, tos; > - size_t fromlen = sizeof (from); > + socklen_t fromlen = sizeof (from); > > if (passivemode) > return (fdopen (data, lmode)); > diff --git a/ftpd/server_mode.c b/ftpd/server_mode.c > index 308b85e..226e53c 100644 > --- a/ftpd/server_mode.c > +++ b/ftpd/server_mode.c > @@ -161,7 +161,7 @@ server_mode (const char *pidfile, struct sockaddr_in > *phis_addr) > children to handle them. */ > while (1) > { > - size_t addrlen = sizeof (*phis_addr); > + socklen_t addrlen = sizeof (*phis_addr); > fd = accept (ctl_sock, (struct sockaddr *) phis_addr, &addrlen); > if (fork () == 0) /* child */ > { > diff --git a/ping/libping.c b/ping/libping.c > index 9f3ca66..ae358e3 100644 > --- a/ping/libping.c > +++ b/ping/libping.c > @@ -172,7 +172,7 @@ my_echo_reply (PING * p, icmphdr_t * icmp) > int > ping_recv (PING * p) > { > - size_t fromlen = sizeof (p->ping_from.ping_sockaddr); > + socklen_t fromlen = sizeof (p->ping_from.ping_sockaddr); > int n, rc; > icmphdr_t *icmp; > struct ip *ip; > diff --git a/rexecd/rexecd.c b/rexecd/rexecd.c > index 8c5b5e0..61fbcc1 100644 > --- a/rexecd/rexecd.c > +++ b/rexecd/rexecd.c > @@ -121,7 +121,7 @@ int > main (int argc, char **argv) > { > struct sockaddr_in from; > - size_t fromlen; > + socklen_t fromlen; > int sockfd = STDIN_FILENO; > int index; > > diff --git a/rlogind/rlogind.c b/rlogind/rlogind.c > index fb59a20..e36b7f8 100644 > --- a/rlogind/rlogind.c > +++ b/rlogind/rlogind.c > @@ -426,7 +426,7 @@ void > rlogin_daemon (int maxchildren, int port) > { > pid_t pid; > - size_t size; > + socklen_t size; > struct sockaddr_in saddr; > int listenfd, fd; > > @@ -595,7 +595,7 @@ rlogind_auth (int fd, struct auth_data *ap) > { > u_char optbuf[BUFSIZ / 3], *cp; > char lbuf[BUFSIZ], *lp; > - size_t optsize = sizeof (optbuf); > + socklen_t optsize = sizeof (optbuf); > int ipproto; > struct protoent *ip; > > @@ -714,7 +714,7 @@ exec_login (int authenticated, struct auth_data *ap) > int > rlogind_mainloop (int infd, int outfd) > { > - size_t size; > + socklen_t size; > struct auth_data auth_data; > int true; > char c; > diff --git a/rshd/rshd.c b/rshd/rshd.c > index 5e008ed..bff32b4 100644 > --- a/rshd/rshd.c > +++ b/rshd/rshd.c > @@ -233,7 +233,7 @@ main (int argc, char *argv[]) > int index; > struct linger linger; > int on = 1; > - size_t fromlen; > + socklen_t fromlen; > struct sockaddr_in from; > int sockfd; > > @@ -364,7 +364,7 @@ doit (int sockfd, struct sockaddr_in *fromp) > { > u_char optbuf[BUFSIZ / 3], *cp; > char lbuf[BUFSIZ], *lp; > - size_t optsize = sizeof (optbuf); > + socklen_t optsize = sizeof (optbuf); > int ipproto; > struct protoent *ip; > > diff --git a/syslogd/syslogd.c b/syslogd/syslogd.c > index 2d4b531..bbe790b 100644 > --- a/syslogd/syslogd.c > +++ b/syslogd/syslogd.c > @@ -625,7 +625,7 @@ main (int argc, char *argv[]) > if (fdarray[i].revents & (POLLIN | POLLPRI)) > { > int result; > - size_t len; > + socklen_t len; > if (fdarray[i].fd == -1) > continue; > else if (fdarray[i].fd == fklog) > diff --git a/talk/ctl.c b/talk/ctl.c > index 1e29171..1a10ad0 100644 > --- a/talk/ctl.c > +++ b/talk/ctl.c > @@ -91,7 +91,7 @@ CTL_MSG msg; > int > open_sockt () > { > - size_t length; > + socklen_t length; > > my_addr.sin_addr = my_machine_addr; > my_addr.sin_port = 0; > @@ -111,7 +111,7 @@ open_sockt () > int > open_ctl () > { > - size_t length; > + socklen_t length; > > ctl_addr.sin_port = 0; > ctl_addr.sin_addr = my_machine_addr; > diff --git a/talkd/talkd.c b/talkd/talkd.c > index 17b07b2..98dd446 100644 > --- a/talkd/talkd.c > +++ b/talkd/talkd.c > @@ -140,7 +140,7 @@ talkd_run (int fd) > struct sockaddr_in sa_in; > CTL_MSG msg; > CTL_RESPONSE resp; > - size_t len; > + socklen_t len; > > len = sizeof sa_in; > rc = > diff --git a/tftp/tftp.c b/tftp/tftp.c > index bf08ab0..90bbde6 100644 > --- a/tftp/tftp.c > +++ b/tftp/tftp.c > @@ -115,7 +115,7 @@ send_file (int fd, char *name, char *mode) > volatile int block, size, convert; > volatile unsigned long amount; > struct sockaddr_in from; > - size_t fromlen; > + socklen_t fromlen; > FILE *file; > > startclock (); /* start stat's clock */ > @@ -228,7 +228,7 @@ recvfile (int fd, char *name, char *mode) > volatile int block, size, firsttrip; > volatile unsigned long amount; > struct sockaddr_in from; > - size_t fromlen; > + socklen_t fromlen; > FILE *file; > volatile int convert; /* true if converting crlf -> lf */ > > diff --git a/tftpd/tftpd.c b/tftpd/tftpd.c > index cd06618..05ea335 100644 > --- a/tftpd/tftpd.c > +++ b/tftpd/tftpd.c > @@ -103,7 +103,7 @@ static int maxtimeout = 5 * TIMEOUT; > static char buf[PKTSIZE]; > static char ackbuf[PKTSIZE]; > static struct sockaddr_in from; > -static size_t fromlen; > +static socklen_t fromlen; > > void tftp (struct tftphdr *, int); > > @@ -227,7 +227,7 @@ main (int argc, char *argv[]) > { > int pid; > int i; > - size_t j; > + socklen_t j; > > for (i = 1; i < 20; i++) > {
