summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2019-10-26 11:34:48 +0000
committerchristos <christos@NetBSD.org>2019-10-26 11:34:48 +0000
commitc88415e4b4ea435032f282bdd9ca64ef78ffa7b2 (patch)
treefd0a31aa79a4d4ebc922de74d470cdfbab0ead7b
parent6ee3568e07897f3ea9881c62de4ddfafd3c0eaed (diff)
use strlcpy() for the uts conversion, makes the code simpler and more readable.
-rw-r--r--sys/compat/sunos/sunos_misc.c18
-rw-r--r--sys/compat/sunos32/sunos32_misc.c18
2 files changed, 16 insertions, 20 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
diff --git a/sys/compat/sunos32/sunos32_misc.c b/sys/compat/sunos32/sunos32_misc.c
index ff70f52e62e..0e9296227a8 100644
--- a/sys/compat/sunos32/sunos32_misc.c
+++ b/sys/compat/sunos32/sunos32_misc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_misc.c,v 1.82 2019/09/23 21:07:39 christos Exp $ */
+/* $NetBSD: sunos32_misc.c,v 1.83 2019/10/26 11:34:48 christos Exp $ */
/* from :NetBSD: sunos_misc.c,v 1.107 2000/12/01 19:25:10 jdolecek Exp */
/*
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.82 2019/09/23 21:07:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_misc.c,v 1.83 2019/10/26 11:34:48 christos Exp $");
#define COMPAT_SUNOS 1
@@ -926,15 +926,13 @@ sunos32_sys_uname(struct lwp *l, const struct sunos32_sys_uname_args *uap, regis
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);
- memcpy(sut.version, "1", sizeof(sut.version) - 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, SCARG_P32(uap, name),
- sizeof(struct sunos_utsname));
+ return copyout(&sut, SCARG_P32(uap, name), sizeof(sut));
}
int
ba4e79d1eb347ff2e3662d6d710ae'>adjust indentationplunky 2006-09-23guard against possible race conditions when detaching SCO pcb'splunky 2006-09-23return ENOTCONN when not connected, rather than EINVALplunky 2006-09-11btsco.c:plunky 2006-09-10update to bluetooth device attachment:plunky 2006-08-27BluetootH SCO Audio update.plunky 2006-07-26Bluetooth fixes by Iain Hibbert:tron