use bounded string ops
This commit is contained in:
parent
6123043789
commit
db9226c772
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: wsdisplay_compat_usl.c,v 1.24 2004/03/24 17:26:53 drochner Exp $ */
|
||||
/* $NetBSD: wsdisplay_compat_usl.c,v 1.25 2004/04/23 21:29:16 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998
|
||||
|
@ -27,7 +27,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.24 2004/03/24 17:26:53 drochner Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsdisplay_compat_usl.c,v 1.25 2004/04/23 21:29:16 itojun Exp $");
|
||||
|
||||
#include "opt_compat_freebsd.h"
|
||||
#include "opt_compat_netbsd.h"
|
||||
|
@ -324,7 +324,7 @@ wsdisplay_usl_ioctl1(struct wsdisplay_softc *sc, u_long cmd, caddr_t data,
|
|||
#ifdef WSDISPLAY_COMPAT_PCVT
|
||||
case VGAPCVTID:
|
||||
#define id ((struct pcvtid *)data)
|
||||
strcpy(id->name, "pcvt");
|
||||
strlcpy(id->name, "pcvt", sizeof(id->name));
|
||||
id->rmajor = 3;
|
||||
id->rminor = 32;
|
||||
#undef id
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: wsemul_vt100_subr.c,v 1.15 2004/03/24 17:26:53 drochner Exp $ */
|
||||
/* $NetBSD: wsemul_vt100_subr.c,v 1.16 2004/04/23 21:29:16 itojun Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1998
|
||||
|
@ -27,7 +27,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_subr.c,v 1.15 2004/03/24 17:26:53 drochner Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsemul_vt100_subr.c,v 1.16 2004/04/23 21:29:16 itojun Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
@ -330,7 +330,7 @@ wsemul_vt100_handle_csi(struct wsemul_vt100_emuldata *edp, u_char c)
|
|||
wsdisplay_emulinput(edp->cbcookie, "\033P2$u", 5);
|
||||
for (i = 0; i < edp->ncols; i++)
|
||||
if (edp->tabs[i]) {
|
||||
n = sprintf(buf, "%s%d",
|
||||
n = snprintf(buf, sizeof(buf), "%s%d",
|
||||
(ps ? "/" : ""), i + 1);
|
||||
wsdisplay_emulinput(edp->cbcookie,
|
||||
buf, n);
|
||||
|
@ -553,7 +553,7 @@ wsemul_vt100_handle_csi(struct wsemul_vt100_emuldata *edp, u_char c)
|
|||
row = ROWS_ABOVE;
|
||||
else
|
||||
row = edp->crow;
|
||||
n = sprintf(buf, "\033[%d;%dR",
|
||||
n = snprintf(buf, sizeof(buf), "\033[%d;%dR",
|
||||
row + 1, edp->ccol + 1);
|
||||
wsdisplay_emulinput(edp->cbcookie, buf, n);
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: wsfont.c,v 1.35 2003/12/15 15:13:55 tsutsui Exp $ */
|
||||
/* $NetBSD: wsfont.c,v 1.36 2004/04/23 21:29:16 itojun Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
|
||||
|
@ -37,7 +37,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.35 2003/12/15 15:13:55 tsutsui Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.36 2004/04/23 21:29:16 itojun Exp $");
|
||||
|
||||
#include "opt_wsfont.h"
|
||||
|
||||
|
@ -394,7 +394,7 @@ wsfont_add0(struct wsdisplay_font *font, int copy)
|
|||
ent->font->data = data;
|
||||
|
||||
name = malloc(strlen(font->name) + 1, M_DEVBUF, M_WAITOK);
|
||||
strcpy(name, font->name);
|
||||
strlcpy(name, font->name, strlen(font->name) + 1);
|
||||
ent->font->name = name;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue