summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k
diff options
context:
space:
mode:
authorHakan Olsson <ho@cvs.openbsd.org>2003-04-06 18:54:21 +0000
committerHakan Olsson <ho@cvs.openbsd.org>2003-04-06 18:54:21 +0000
commit51ab7e02d9e6e7c9950f34bc0cc7cc72bb53bd12 (patch)
tree749f8097655f1aa27f2d7a4a1ecdad5e155781a5 /sys/arch/mvme68k
parent0f64621783b3f46a4851826b9f4284e3c9dbeb61 (diff)
strcat/strcpy/sprintf cleanup. krw@, anil@ ok. art@ tested sparc64.
Diffstat (limited to 'sys/arch/mvme68k')
-rw-r--r--sys/arch/mvme68k/mvme68k/autoconf.c10
-rw-r--r--sys/arch/mvme68k/mvme68k/machdep.c32
2 files changed, 21 insertions, 21 deletions
diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c
index 17574d66267..5a4c488b8ae 100644
--- a/sys/arch/mvme68k/mvme68k/autoconf.c
+++ b/sys/arch/mvme68k/mvme68k/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.19 2003/02/24 22:13:39 miod Exp $ */
+/* $OpenBSD: autoconf.c,v 1.20 2003/04/06 18:54:19 ho Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -407,7 +407,7 @@ setroot()
printf(": ");
len = getsn(buf, sizeof(buf));
if (len == 0 && bootdv != NULL) {
- strcpy(buf, bootdv->dv_xname);
+ strlcpy(buf, bootdv->dv_xname, sizeof buf);
len = strlen(buf);
}
if (len > 0 && buf[len - 1] == '*') {
@@ -566,13 +566,13 @@ getdevunit(name, unit)
int lunit;
/* compute length of name and decimal expansion of unit number */
- sprintf(num, "%d", unit);
+ snprintf(num, sizeof num, "%d", unit);
lunit = strlen(num);
if (strlen(name) + lunit >= sizeof(fullname) - 1)
panic("config_attach: device name too long");
- strcpy(fullname, name);
- strcat(fullname, num);
+ strlcpy(fullname, name, sizeof fullname);
+ strlcat(fullname, num, sizeof fullname);
while (strcmp(dev->dv_xname, fullname) != 0) {
if ((dev = dev->dv_list.tqe_next) == NULL)
diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c
index 28f8a23a2b3..636e3aaf90a 100644
--- a/sys/arch/mvme68k/mvme68k/machdep.c
+++ b/sys/arch/mvme68k/mvme68k/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.74 2003/01/04 17:41:17 miod Exp $ */
+/* $OpenBSD: machdep.c,v 1.75 2003/04/06 18:54:19 ho Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -517,9 +517,9 @@ identifycpu()
#ifdef MVME147
case CPU_147:
bcopy(&brdid.suffix, suffix, sizeof brdid.suffix);
- sprintf(suffix, "MVME%x", brdid.model, suffix);
+ snprintf(suffix, sizeof suffix, "MVME%x", brdid.model, suffix);
cpuspeed = pccspeed((struct pccreg *)IIOV(0xfffe1000));
- sprintf(speed, "%02d", cpuspeed);
+ snprintf(speed, sizeof speed, "%02d", cpuspeed);
break;
#endif
#if defined(MVME162) || defined(MVME167) || defined(MVME172) || defined(MVME177)
@@ -547,8 +547,8 @@ identifycpu()
break;
#endif
}
- sprintf(cpu_model, "Motorola %s: %sMHz MC680%c0 CPU",
- suffix, speed, mc);
+ snprintf(cpu_model, sizeof cpu_model,
+ "Motorola %s: %sMHz MC680%c0 CPU", suffix, speed, mc);
switch (mmutype) {
#if defined(M68060) || defined(M68040)
case MMU_68060:
@@ -557,31 +557,30 @@ identifycpu()
bcopy(&fpsp_tab, &fpvect_tab,
(&fpvect_end - &fpvect_tab) * sizeof (fpvect_tab));
#endif
- strcat(cpu_model, "+MMU");
+ strlcat(cpu_model, "+MMU", sizeof cpu_model);
break;
#endif
case MMU_68030:
- strcat(cpu_model, "+MMU");
+ strlcat(cpu_model, "+MMU", sizeof cpu_model);
break;
case MMU_68851:
- strcat(cpu_model, ", MC68851 MMU");
+ strlcat(cpu_model, ", MC68851 MMU", sizeof cpu_model);
break;
default:
printf("%s\n", cpu_model);
panic("unknown MMU type %d", mmutype);
}
- len = strlen(cpu_model);
switch (mmutype) {
#if defined(M68060)
case MMU_68060:
- len += sprintf(cpu_model + len,
- "+FPU, 8k on-chip physical I/D caches");
+ strlcat(cpu_model,"+FPU, 8k on-chip physical I/D caches",
+ sizeof cpu_model);
break;
#endif
#if defined(M68040)
case MMU_68040:
- len += sprintf(cpu_model + len,
- "+FPU, 4k on-chip physical I/D caches");
+ strlcat(cpu_model, "+FPU, 4k on-chip physical I/D caches",
+ sizeof cpu_model);
break;
#endif
#if defined(M68030) || defined(M68020)
@@ -593,11 +592,12 @@ identifycpu()
break;
case FPU_68881:
case FPU_68882:
- len += sprintf(cpu_model + len, ", MC6888%d FPU",
- fputype);
+ len = strlen (cpu_model);
+ snprintf(cpu_model + len, sizeof cpu_model - len,
+ ", MC6888%d FPU", fputype);
break;
default:
- len += sprintf(cpu_model + len, ", unknown FPU", speed);
+ strlcat(cpu_model, ", unknown FPU", sizeof cpu_model);
break;
}
break;