X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_serial.c;h=c5cacfa114c3653e4c769875048449ef4a982280;hb=4cd71da5603898cff68a31774be570750d7fd659;hp=202ffc0a84971150813dd1e04a03f841216adfb1;hpb=78d9ecfd4f1e37f7453e55e71f2909a58706ae10;p=elogind.git

diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index 202ffc0a8..c5cacfa11 100644
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -803,12 +803,14 @@ int scsi_std_inquiry(struct scsi_id_device *dev_scsi, const char *devname)
 		return retval;
 
 	memcpy(dev_scsi->vendor, buf + 8, 8);
+	dev_scsi->vendor[8] = '\0';
 	memcpy(dev_scsi->model, buf + 16, 16);
+	dev_scsi->model[16] = '\0';
 	memcpy(dev_scsi->revision, buf + 32, 4);
+	dev_scsi->revision[4] = '\0';
 	sprintf(dev_scsi->type,"%x", buf[0] & 0x1f);
 
-	if (close(fd) < 0)
-		info("%s: close failed: %s\n", dev_scsi->kernel, strerror(errno));
+	close(fd);
 
 	return 0;
 }