--- trunk/src/devices/dev_turbochannel.c	2007/10/08 16:18:00	4
+++ trunk/src/devices/dev_turbochannel.c	2007/10/08 16:18:27	10
@@ -25,7 +25,7 @@
  *  SUCH DAMAGE.
  *   
  *
- *  $Id: dev_turbochannel.c,v 1.40 2005/02/18 06:19:19 debug Exp $
+ *  $Id: dev_turbochannel.c,v 1.42 2005/06/26 11:43:48 debug Exp $
  *  
  *  Generic framework for TURBOchannel devices, used in DECstation machines.
  */
@@ -41,6 +41,10 @@
 #include "sfbreg.h"
 
 
+#define	DEVICE_NAME_BUFLEN		9
+#define	CARD_NAME_BUFLEN		9
+#define	CARD_FIRMWARE_BUFLEN		5
+
 struct turbochannel_data {
 	int		slot_nr;
 	uint64_t	baseaddr;
@@ -49,13 +53,13 @@
 
 	int		rom_skip;
 
-	char		device_name[9];		/*  NUL-terminated  */
+	char		device_name[DEVICE_NAME_BUFLEN];  /*  NUL-terminated  */
 
 	/*  These should be terminated with spaces  */
-	char		card_firmware_version[8];
-	char		card_vendor_name[8];
-	char		card_module_name[8];
-	char		card_firmware_type[4];
+	char		card_firmware_version[CARD_NAME_BUFLEN];
+	char		card_vendor_name[CARD_NAME_BUFLEN];
+	char		card_module_name[CARD_NAME_BUFLEN];
+	char		card_firmware_type[CARD_FIRMWARE_BUFLEN];
 };
 
 
@@ -179,10 +183,9 @@
 {
 	struct vfb_data *fb;
 	struct turbochannel_data *d;
-	int rom_offset = 0x3c0000;
-	int rom_length = DEV_TURBOCHANNEL_LEN;
-	int rom_skip = 0;
+	int rom_offset=0x3c0000, rom_length=DEV_TURBOCHANNEL_LEN, rom_skip=0;
 	char *name2;
+	size_t nlen;
 
 	if (device_name == NULL)
 		return;
@@ -203,14 +206,14 @@
 	d->endaddr  = endaddr;
 	d->irq      = irq;
 
-	strcpy(d->device_name, device_name);
+	strlcpy(d->device_name, device_name, DEVICE_NAME_BUFLEN);
 
-	strncpy(d->card_firmware_version, "V5.3a   ", 8);
-	strncpy(d->card_vendor_name,      "DEC     ", 8);
-	strncpy(d->card_firmware_type,    "TCF0", 4);
+	strncpy(d->card_firmware_version, "V5.3a   ", CARD_NAME_BUFLEN);
+	strncpy(d->card_vendor_name,      "DEC     ", CARD_NAME_BUFLEN);
+	strncpy(d->card_firmware_type,    "TCF0", CARD_FIRMWARE_BUFLEN);
 
 	memset(d->card_module_name, ' ', 8);
-	strncpy(d->card_module_name, device_name, strlen(device_name));
+	memcpy(d->card_module_name, device_name, strlen(device_name));
 
 	/*
 	 *  According to NetBSD/pmax:
@@ -320,15 +323,16 @@
 
 	d->rom_skip = rom_skip;
 
-	name2 = malloc(strlen(device_name) + 30);
+	nlen = strlen(device_name) + 30;
+	name2 = malloc(nlen);
 	if (name2 == NULL) {
 		fprintf(stderr, "out of memory in dev_turbochannel_init()\n");
 		exit(1);
 	}
 	if (*device_name)
-		sprintf(name2, "turbochannel [%s]", device_name);
+		snprintf(name2, nlen, "turbochannel [%s]", device_name);
 	else
-		sprintf(name2, "turbochannel");
+		snprintf(name2, nlen, "turbochannel");
 
 	memory_device_register(mem, name2, baseaddr + rom_offset + rom_skip,
 	    rom_length-rom_skip, dev_turbochannel_access, d, MEM_DEFAULT, NULL);