d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1) Move FreeBSD ID below vendor ID and don't compile vendor ID.

Browse Source 
2) Cast some numbers we know to be positive to size_t before we MIN them
   with the result of a sizeof.
3) Compare result of inet_addr to INADDR_NONE, not -1.
This commit is contained in:
David Malone 2002-02-27 15:22:12 +00:00
parent cb83438de4
commit 8f4c8256b2
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=91387
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.bin/tftp/main.c
View File

@ -31,19 +31,20 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#ifndef lint
static const char copyright[] =
"@(#) Copyright (c) 1983, 1993\n\
The Regents of the University of California. All rights reserved.\n";
#endif
#if 0
#ifndef lint
static const char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93";
#endif
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
/* Many bug fixes are from Jim Guyton <guyton@rand-unix> */
@ -208,12 +209,12 @@ setpeer(argc, argv)
if (host) {
peeraddr.sin_family = host->h_addrtype;
bcopy(host->h_addr, &peeraddr.sin_addr,
MIN(sizeof(peeraddr.sin_addr), host->h_length));
MIN(sizeof(peeraddr.sin_addr), (size_t)host->h_length));
strncpy(hostname, host->h_name, sizeof(hostname));
} else {
peeraddr.sin_family = AF_INET;
peeraddr.sin_addr.s_addr = inet_addr(argv[1]);
if (peeraddr.sin_addr.s_addr == -1) {
if (peeraddr.sin_addr.s_addr == INADDR_NONE) {
connected = 0;
printf("%s: unknown host\n", argv[1]);
return;
@ -354,7 +355,7 @@ put(argc, argv)
return;
}
bcopy(hp->h_addr, (caddr_t)&peeraddr.sin_addr,
MIN(sizeof(peeraddr.sin_addr), hp->h_length));
MIN(sizeof(peeraddr.sin_addr), (size_t)hp->h_length));
peeraddr.sin_family = hp->h_addrtype;
connected = 1;
strncpy(hostname, hp->h_name, sizeof(hostname));
@ -452,7 +453,7 @@ get(argc, argv)
continue;
}
bcopy(hp->h_addr, (caddr_t)&peeraddr.sin_addr,
MIN(sizeof(peeraddr.sin_addr), hp->h_length));
MIN(sizeof(peeraddr.sin_addr), (size_t)hp->h_length));
peeraddr.sin_family = hp->h_addrtype;
connected = 1;
strncpy(hostname, hp->h_name, sizeof(hostname));