diff options
| -rw-r--r-- | usr.bin/tftp/main.c | 14 | ||||
| -rw-r--r-- | usr.bin/tftp/tftp.c | 10 | ||||
| -rw-r--r-- | usr.sbin/popa3d/standalone.c | 4 |
3 files changed, 19 insertions, 9 deletions
diff --git a/usr.bin/tftp/main.c b/usr.bin/tftp/main.c index 33c6009c215..3a5936df045 100644 --- a/usr.bin/tftp/main.c +++ b/usr.bin/tftp/main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: main.c,v 1.28 2006/07/26 22:43:53 mglocker Exp $ */ +/* $OpenBSD: main.c,v 1.29 2007/05/11 01:47:48 ray Exp $ */ /* $NetBSD: main.c,v 1.6 1995/05/21 16:54:10 mycroft Exp $ */ /* @@ -41,7 +41,7 @@ static const char copyright[] = static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$OpenBSD: main.c,v 1.28 2006/07/26 22:43:53 mglocker Exp $"; + "$OpenBSD: main.c,v 1.29 2007/05/11 01:47:48 ray Exp $"; #endif /* not lint */ /* @@ -299,12 +299,14 @@ modecmd(int argc, char *argv[]) return; } +/* ARGSUSED */ void setbinary(int argc, char *argv[]) { settftpmode("octet"); } +/* ARGSUSED */ void setascii(int argc, char *argv[]) { @@ -344,7 +346,6 @@ put(int argc, char *argv[]) } targ = argv[argc - 1]; if (strchr(argv[argc - 1], ':')) { - char *cp; struct hostent *hp; for (n = 1; n < argc - 1; n++) @@ -552,6 +553,7 @@ settimeout(int argc, char *argv[]) maxtimeout = t; } +/* ARGSUSED */ void status(int argc, char *argv[]) { @@ -565,6 +567,7 @@ status(int argc, char *argv[]) rexmtval, maxtimeout); } +/* ARGSUSED */ void intr(int signo) { @@ -683,6 +686,7 @@ makeargv(void) return (ret); } +/* ARGSUSED */ void quit(int argc, char *argv[]) { @@ -716,6 +720,7 @@ help(int argc, char *argv[]) } } +/* ARGSUSED */ void settrace(int argc, char *argv[]) { @@ -723,6 +728,7 @@ settrace(int argc, char *argv[]) printf("Packet tracing %s.\n", trace ? "on" : "off"); } +/* ARGSUSED */ void setverbose(int argc, char *argv[]) { @@ -730,6 +736,7 @@ setverbose(int argc, char *argv[]) printf("Verbose mode %s.\n", verbose ? "on" : "off"); } +/* ARGSUSED */ void settsize(int argc, char *argv[]) { @@ -741,6 +748,7 @@ settsize(int argc, char *argv[]) has_options--; } +/* ARGSUSED */ void settout(int argc, char *argv[]) { diff --git a/usr.bin/tftp/tftp.c b/usr.bin/tftp/tftp.c index 3638b2731fe..e13af0c0a49 100644 --- a/usr.bin/tftp/tftp.c +++ b/usr.bin/tftp/tftp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tftp.c,v 1.20 2006/07/26 09:10:03 mglocker Exp $ */ +/* $OpenBSD: tftp.c,v 1.21 2007/05/11 01:47:48 ray Exp $ */ /* $NetBSD: tftp.c,v 1.5 1995/04/29 05:55:25 cgd Exp $ */ /* @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)tftp.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$OpenBSD: tftp.c,v 1.20 2006/07/26 09:10:03 mglocker Exp $"; + "$OpenBSD: tftp.c,v 1.21 2007/05/11 01:47:48 ray Exp $"; #endif /* not lint */ /* @@ -135,8 +135,9 @@ sendfile(int fd, char *name, char *mode) struct sockaddr_in from; struct pollfd pfd[1]; unsigned long amount; + socklen_t fromlen; int convert; /* true if converting crlf -> lf */ - int n, nfds, error, fromlen, timeouts, block, size; + int n, nfds, error, timeouts, block, size; startclock(); /* start stat's clock */ dp = r_init(); /* reset fillbuf/read-ahead code */ @@ -266,8 +267,9 @@ recvfile(int fd, char *name, char *mode) struct sockaddr_in from; struct pollfd pfd[1]; unsigned long amount; + socklen_t fromlen; int convert; /* true if converting crlf -> lf */ - int n, nfds, error, fromlen, timeouts, block, size; + int n, nfds, error, timeouts, block, size; int firsttrip; startclock(); /* start stat's clock */ diff --git a/usr.sbin/popa3d/standalone.c b/usr.sbin/popa3d/standalone.c index 948c86fc689..b3fc26a8fc6 100644 --- a/usr.sbin/popa3d/standalone.c +++ b/usr.sbin/popa3d/standalone.c @@ -1,4 +1,4 @@ -/* $OpenBSD: standalone.c,v 1.10 2005/03/13 19:29:44 otto Exp $ */ +/* $OpenBSD: standalone.c,v 1.11 2007/05/11 01:47:48 ray Exp $ */ /* * Standalone POP server: accepts connections, checks the anti-flood limits, @@ -225,7 +225,7 @@ handle(int sock) int new; char hbuf[NI_MAXHOST]; struct sockaddr_storage addr; - int addrlen; + socklen_t addrlen; pid_t pid; struct tms buf; int error; |