diff options
| author | christos <christos@NetBSD.org> | 2019-10-26 11:34:48 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2019-10-26 11:34:48 +0000 |
| commit | c88415e4b4ea435032f282bdd9ca64ef78ffa7b2 (patch) | |
| tree | fd0a31aa79a4d4ebc922de74d470cdfbab0ead7b /sys/compat/sunos | |
| parent | 6ee3568e07897f3ea9881c62de4ddfafd3c0eaed (diff) | |
use strlcpy() for the uts conversion, makes the code simpler and more readable.
Diffstat (limited to 'sys/compat/sunos')
| -rw-r--r-- | sys/compat/sunos/sunos_misc.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sys/compat/sunos/sunos_misc.c b/sys/compat/sunos/sunos_misc.c index 101bb69325c..9156b0eaf8b 100644 --- a/sys/compat/sunos/sunos_misc.c +++ b/sys/compat/sunos/sunos_misc.c @@ -1,4 +1,4 @@ -/* $NetBSD: sunos_misc.c,v 1.175 2019/10/04 12:24:12 mrg Exp $ */ +/* $NetBSD: sunos_misc.c,v 1.176 2019/10/26 11:34:48 christos Exp $ */ /* * Copyright (c) 1992, 1993 @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.175 2019/10/04 12:24:12 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.176 2019/10/26 11:34:48 christos Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -653,15 +653,13 @@ sunos_sys_uname(struct lwp *l, const struct sunos_sys_uname_args *uap, register_ memset(&sut, 0, sizeof(sut)); - memcpy(sut.sysname, ostype, sizeof(sut.sysname) - 1); - memcpy(sut.nodename, hostname, sizeof(sut.nodename)); - sut.nodename[sizeof(sut.nodename)-1] = '\0'; - memcpy(sut.release, osrelease, sizeof(sut.release) - 1); - sut.version[0] = '1'; - memcpy(sut.machine, machine, sizeof(sut.machine) - 1); + strlcpy(sut.sysname, ostype, sizeof(sut.sysname)); + strlcpy(sut.nodename, hostname, sizeof(sut.nodename)); + strlcpy(sut.release, osrelease, sizeof(sut.release)); + strlcpy(sut.version, "1", sizeof(sut.version)); + strlcpy(sut.machine, machine, sizeof(sut.machine)); - return copyout((void *)&sut, (void *)SCARG(uap, name), - sizeof(struct sunos_utsname)); + return copyout(&sut, SCARG(uap, name), sizeof(sut)); } int |
