CVS commit: src/usr.bin/who

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Fri Oct  4 11:43:07 UTC 2019

Modified Files:
        src/usr.bin/who: utmpentry.c

Log Message:
revert previous; i meant to test first and if you read the comment
immediately above, you can see it is done safely and on purpose.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/who/utmpentry.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/usr.bin/who/utmpentry.c
diff -u src/usr.bin/who/utmpentry.c:1.19 src/usr.bin/who/utmpentry.c:1.20
--- src/usr.bin/who/utmpentry.c:1.19	Fri Oct  4 11:40:43 2019
+++ src/usr.bin/who/utmpentry.c	Fri Oct  4 11:43:07 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: utmpentry.c,v 1.19 2019/10/04 11:40:43 mrg Exp $	*/
+/*	$NetBSD: utmpentry.c,v 1.20 2019/10/04 11:43:07 mrg Exp $	*/
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: utmpentry.c,v 1.19 2019/10/04 11:40:43 mrg Exp $");
+__RCSID("$NetBSD: utmpentry.c,v 1.20 2019/10/04 11:43:07 mrg Exp $");
 #endif
 
 #include <sys/stat.h>
@@ -283,9 +283,9 @@ getentry(struct utmpentry *e, struct utm
 	 * reason we use the size of the _source_ as the length
 	 * argument.
 	 */
-	(void)strncpy(e->name, up->ut_name, sizeof(e->name));
-	(void)strncpy(e->line, up->ut_line, sizeof(e->line));
-	(void)strncpy(e->host, up->ut_host, sizeof(e->host));
+	(void)strncpy(e->name, up->ut_name, sizeof(up->ut_name));
+	(void)strncpy(e->line, up->ut_line, sizeof(up->ut_line));
+	(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
 
 	e->tv.tv_sec = up->ut_time;
 	e->tv.tv_usec = 0;
@@ -314,9 +314,9 @@ getentryx(struct utmpentry *e, struct ut
 	 * reason we use the size of the _source_ as the length
 	 * argument.
 	 */
-	(void)strncpy(e->name, up->ut_name, sizeof(e->name));
-	(void)strncpy(e->line, up->ut_line, sizeof(e->line));
-	(void)strncpy(e->host, up->ut_host, sizeof(e->host));
+	(void)strncpy(e->name, up->ut_name, sizeof(up->ut_name));
+	(void)strncpy(e->line, up->ut_line, sizeof(up->ut_line));
+	(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
 
 	e->tv = up->ut_tv;
 	e->pid = up->ut_pid;