diff options
| author | charnier <charnier@FreeBSD.org> | 1997-10-29 07:35:27 +0000 |
|---|---|---|
| committer | charnier <charnier@FreeBSD.org> | 1997-10-29 07:35:27 +0000 |
| commit | 97cd2cfa61365cc76deb31f3cf0649fe87138596 (patch) | |
| tree | d2250f420d9ca7e8c5a799895485d1405c24d16c /usr.sbin/timed | |
| parent | 68d30808a9b4aace82ed37f4212fa6e5b3e66fd1 (diff) | |
| download | FreeBSD-src-97cd2cfa61365cc76deb31f3cf0649fe87138596.zip FreeBSD-src-97cd2cfa61365cc76deb31f3cf0649fe87138596.tar.gz | |
Back out strcpy() -> strncpy() changes. According to Bruce, they are unneeded.
Check the return value of gethostname() like in timed. Make enough place to
NUL-terminate the result.
Diffstat (limited to 'usr.sbin/timed')
| -rw-r--r-- | usr.sbin/timed/timedc/cmds.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/usr.sbin/timed/timedc/cmds.c b/usr.sbin/timed/timedc/cmds.c index 7505438..e52afa4 100644 --- a/usr.sbin/timed/timedc/cmds.c +++ b/usr.sbin/timed/timedc/cmds.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)cmds.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$Id$"; + "$Id: cmds.c,v 1.3 1997/10/22 06:20:04 charnier Exp $"; #endif /* not lint */ #include "timedc.h" @@ -68,7 +68,7 @@ static const char rcsid[] = int sock; int sock_raw; -char myname[MAXHOSTNAMELEN]; +char myname[MAXHOSTNAMELEN+1]; struct hostent *hp; struct sockaddr_in server; struct sockaddr_in dayaddr; @@ -185,7 +185,8 @@ clockdiff(argc, argv) return; } - (void)gethostname(myname,sizeof(myname)); + if (gethostname(myname, sizeof(myname) - 1) < 0) + err(1, "gethostname"); /* get the address for the date ready */ sp = getservbyname(DATE_PORT, DATE_PROTO); @@ -295,7 +296,8 @@ msite(argc, argv) dest.sin_port = srvp->s_port; dest.sin_family = AF_INET; - (void)gethostname(myname, sizeof(myname)); + if (gethostname(myname, sizeof(myname) - 1) < 0) + err(1, "gethostname"); i = 1; do { tgtname = (i >= argc) ? myname : argv[i]; @@ -306,8 +308,7 @@ msite(argc, argv) } bcopy(hp->h_addr, &dest.sin_addr.s_addr, hp->h_length); - (void)strncpy(msg.tsp_name, myname, sizeof msg.tsp_name-1); - msg.tsp_name[sizeof msg.tsp_name-1] = '\0'; + (void)strcpy(msg.tsp_name, myname); msg.tsp_type = TSP_MSITE; msg.tsp_vers = TSPVERSION; bytenetorder(&msg); @@ -394,8 +395,9 @@ testing(argc, argv) msg.tsp_type = TSP_TEST; msg.tsp_vers = TSPVERSION; - (void)gethostname(myname, sizeof(myname)); - (void)strncpy(msg.tsp_name, myname, sizeof(msg.tsp_name)); + if (gethostname(myname, sizeof(myname) - 1) < 0) + err(1, "gethostname"); + (void)strcpy(msg.tsp_name, myname); bytenetorder(&msg); if (sendto(sock, &msg, sizeof(struct tsp), 0, (struct sockaddr*)&sin, @@ -437,7 +439,8 @@ tracing(argc, argv) dest.sin_port = srvp->s_port; dest.sin_family = AF_INET; - (void)gethostname(myname,sizeof(myname)); + if (gethostname(myname, sizeof(myname) - 1) < 0) + err(1, "gethostname"); hp = gethostbyname(myname); bcopy(hp->h_addr, &dest.sin_addr.s_addr, hp->h_length); @@ -449,8 +452,7 @@ tracing(argc, argv) onflag = OFF; } - (void)strncpy(msg.tsp_name, myname, sizeof msg.tsp_name-1); - msg.tsp_name[sizeof msg.tsp_name-1] = '\0'; + (void)strcpy(msg.tsp_name, myname); msg.tsp_vers = TSPVERSION; bytenetorder(&msg); if (sendto(sock, &msg, sizeof(struct tsp), 0, |
