summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2003-07-12 13:23:55 +0000
committeritojun <itojun@NetBSD.org>2003-07-12 13:23:55 +0000
commit032ed69f9a47a49c09dd24ffb4e5dfa09cd030b8 (patch)
tree7a1ccda107e800453dafc3f5041e5ada3118f8af /bin
parenta7f5ddbf6454871154c3109480b03fd50760ff2d (diff)
strlcpy
Diffstat (limited to 'bin')
-rw-r--r--bin/csh/sem.c10
-rw-r--r--bin/date/netdate.c6
2 files changed, 7 insertions, 9 deletions
diff --git a/bin/csh/sem.c b/bin/csh/sem.c
index 04710b98ac9..1f6576e0f2c 100644
--- a/bin/csh/sem.c
+++ b/bin/csh/sem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sem.c,v 1.21 2003/01/16 09:38:41 kleink Exp $ */
+/* $NetBSD: sem.c,v 1.22 2003/07/12 13:24:52 itojun Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)sem.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: sem.c,v 1.21 2003/01/16 09:38:41 kleink Exp $");
+__RCSID("$NetBSD: sem.c,v 1.22 2003/07/12 13:24:52 itojun Exp $");
#endif
#endif /* not lint */
@@ -542,8 +542,7 @@ doio(struct command *t, int *pipein, int *pipeout)
(void)dcopy(SHOUT, 1);
(void)dcopy(SHERR, 2);
cp = splicepipe(t, t->t_dlef);
- (void)strncpy(tmp, short2str(cp), MAXPATHLEN);
- tmp[MAXPATHLEN] = '\0';
+ (void)strlcpy(tmp, short2str(cp), sizeof(tmp));
xfree((ptr_t) cp);
if ((fd = open(tmp, O_RDONLY)) < 0) {
stderror(ERR_SYSTEM, tmp, strerror(errno));
@@ -571,8 +570,7 @@ doio(struct command *t, int *pipein, int *pipeout)
char tmp[MAXPATHLEN+1];
cp = splicepipe(t, t->t_drit);
- (void)strncpy(tmp, short2str(cp), MAXPATHLEN);
- tmp[MAXPATHLEN] = '\0';
+ (void)strlcpy(tmp, short2str(cp), sizeof(tmp));
xfree((ptr_t) cp);
/*
* so > /dev/std{out,err} work
diff --git a/bin/date/netdate.c b/bin/date/netdate.c
index c3f8ca74d82..b07f01f6b8f 100644
--- a/bin/date/netdate.c
+++ b/bin/date/netdate.c
@@ -1,4 +1,4 @@
-/* $NetBSD: netdate.c,v 1.22 2002/09/21 18:15:57 mycroft Exp $ */
+/* $NetBSD: netdate.c,v 1.23 2003/07/12 13:23:55 itojun Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)netdate.c 8.2 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: netdate.c,v 1.22 2002/09/21 18:15:57 mycroft Exp $");
+__RCSID("$NetBSD: netdate.c,v 1.23 2003/07/12 13:23:55 itojun Exp $");
#endif
#endif /* not lint */
@@ -131,7 +131,7 @@ netsettime(time_t tval)
goto bad;
}
hostname[sizeof(hostname) - 1] = '\0';
- (void)strncpy(msg.tsp_name, hostname, sizeof(hostname));
+ (void)strlcpy(msg.tsp_name, hostname, sizeof(msg.tsp_name));
msg.tsp_seq = htons((u_short)0);
msg.tsp_time.tv_sec = htonl((u_long)tval);
msg.tsp_time.tv_usec = htonl((u_long)0);