From 09e0e54b1e3a4d986e7e121206fbd1fb2363c118 Mon Sep 17 00:00:00 2001 From: kris Date: Tue, 24 Jul 2001 11:36:56 +0000 Subject: Replace strncpy -> strlcpy Obtained from: OpenBSD MFC after: 1 week --- usr.sbin/ac/ac.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'usr.sbin/ac') diff --git a/usr.sbin/ac/ac.c b/usr.sbin/ac/ac.c index 3b2c39d..1b3ef8c 100644 --- a/usr.sbin/ac/ac.c +++ b/usr.sbin/ac/ac.c @@ -132,8 +132,7 @@ add_tty(name) tp->ret = 0; name++; } - (void)strncpy(tp->name, name, sizeof (tp->name) - 1); - tp->name[sizeof (tp->name) - 1] = '\0'; + strlcpy(tp->name, name, sizeof (tp->name)); if ((rcp = strchr(tp->name, '*')) != NULL) { /* wild card */ *rcp = '\0'; tp->len = strlen(tp->name); /* match len bytes only */ @@ -213,8 +212,7 @@ update_user(head, name, secs) if ((up = NEW(struct user_list)) == NULL) errx(1, "malloc failed"); up->next = head; - (void)strncpy(up->name, name, sizeof (up->name) - 1); - up->name[sizeof (up->name) - 1] = '\0'; /* paranoid! */ + strlcpy(up->name, name, sizeof (up->name)); up->secs = secs; Total += secs; return up; @@ -429,8 +427,7 @@ log_in(head, up) /* * this allows us to pick the right logout */ - (void)strncpy(up->ut_line, Console, sizeof (up->ut_line) - 1); - up->ut_line[sizeof (up->ut_line) - 1] = '\0'; /* paranoid! */ + strlcpy(up->ut_line, Console, sizeof (up->ut_line)); } #endif /* -- cgit v1.1