--- a/cdrecord/scsi_cdr.c	2009-07-10 19:44:45.000000000 +0000
+++ b/cdrecord/scsi_cdr.c	2010-12-08 05:17:23.926780318 +0000
@@ -2315,26 +2315,31 @@
 		if (inq->add_len == 0) {
 			if (scgp->dev == DEV_UNKNOWN && got_inquiry) {
 				scgp->dev = DEV_ACB5500;
-				strcpy(inq->vendor_info,
-					"ADAPTEC ACB-5500        FAKE");
+				memcpy(inq->vendor_info, "ADAPTEC ", sizeof(inq->vendor_info));
+				memcpy(inq->prod_ident, "ACB-5500        ", sizeof(inq->prod_ident));
+				memcpy(inq->prod_revision, "FAKE", sizeof(inq->prod_revision));
 
 			} else switch (scgp->dev) {
 
 			case DEV_ACB40X0:
-				strcpy(inq->vendor_info,
-					"ADAPTEC ACB-40X0        FAKE");
+				memcpy(inq->vendor_info, "ADAPTEC ", sizeof(inq->vendor_info));
+				memcpy(inq->prod_ident, "ACB-40X0        ", sizeof(inq->prod_ident));
+				memcpy(inq->prod_revision, "FAKE", sizeof(inq->prod_revision));
 				break;
 			case DEV_ACB4000:
-				strcpy(inq->vendor_info,
-					"ADAPTEC ACB-4000        FAKE");
+				memcpy(inq->vendor_info, "ADAPTEC ", sizeof(inq->vendor_info));
+				memcpy(inq->prod_ident, "ACB-4000        ", sizeof(inq->prod_ident));
+				memcpy(inq->prod_revision, "FAKE", sizeof(inq->prod_revision));
 				break;
 			case DEV_ACB4010:
-				strcpy(inq->vendor_info,
-					"ADAPTEC ACB-4010        FAKE");
+				memcpy(inq->vendor_info, "ADAPTEC ", sizeof(inq->vendor_info));
+				memcpy(inq->prod_ident, "ACB-4010        ", sizeof(inq->prod_ident));
+				memcpy(inq->prod_revision, "FAKE", sizeof(inq->prod_revision));
 				break;
 			case DEV_ACB4070:
-				strcpy(inq->vendor_info,
-					"ADAPTEC ACB-4070        FAKE");
+				memcpy(inq->vendor_info, "ADAPTEC ", sizeof(inq->vendor_info));
+				memcpy(inq->prod_ident, "ACB-4070        ", sizeof(inq->prod_ident));
+				memcpy(inq->prod_revision, "FAKE", sizeof(inq->prod_revision));
 				break;
 			}
 		} else if (inq->add_len < 31) {
@@ -2364,14 +2369,16 @@
 
 	case INQ_SEQD:
 		if (scgp->dev == DEV_SC4000) {
-			strcpy(inq->vendor_info,
-				"SYSGEN  SC4000          FAKE");
+			memcpy(inq->vendor_info, "SYSGEN  ", sizeof(inq->vendor_info));
+			memcpy(inq->prod_ident, "SC4000          ", sizeof(inq->prod_ident));
+			memcpy(inq->prod_revision, "FAKE", sizeof(inq->prod_revision));
 		} else if (inq->add_len == 0 &&
 					inq->removable &&
 						inq->ansi_version == 1) {
 			scgp->dev = DEV_MT02;
-			strcpy(inq->vendor_info,
-				"EMULEX  MT02            FAKE");
+			memcpy(inq->vendor_info, "EMULEX  ", sizeof(inq->vendor_info));
+			memcpy(inq->prod_ident, "MT02            ", sizeof(inq->prod_ident));
+			memcpy(inq->prod_revision, "FAKE", sizeof(inq->prod_revision));
 		}
 		break;