From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 20 Nov 2008 06:57:17 +0000 (+0100)
Subject: scsi_id: make sure, we do not have slashes in values
X-Git-Tag: 174~1297
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=1340a9e9ec72bde2eac873167920739883ada650;hp=97f37a7e784d11e3aabdc676b5af90d3bc1a1793

scsi_id: make sure, we do not have slashes in values
---

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 69994dd9d..943cbb21c 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -502,9 +502,12 @@ static int set_inq_values(struct udev *udev, struct scsi_id_device *dev_scsi, co
 		return retval;
 
 	udev_util_replace_whitespace(dev_scsi->vendor, vendor_str, sizeof(vendor_str));
+	udev_util_replace_chars(vendor_str, NULL);
 	udev_util_replace_whitespace(dev_scsi->model, model_str, sizeof(model_str));
+	udev_util_replace_chars(model_str, NULL);
 	set_type(dev_scsi->type, type_str, sizeof(type_str));
 	udev_util_replace_whitespace(dev_scsi->revision, revision_str, sizeof(revision_str));
+	udev_util_replace_chars(revision_str, NULL);
 	return 0;
 }
 
@@ -572,8 +575,10 @@ static int scsi_id(struct udev *udev, char *maj_min_dev)
 			printf("ID_MODEL=%s\n", model_str);
 			printf("ID_REVISION=%s\n", revision_str);
 			udev_util_replace_whitespace(dev_scsi.serial, serial_str, sizeof(serial_str));
+			udev_util_replace_chars(serial_str, NULL);
 			printf("ID_SERIAL=%s\n", serial_str);
 			udev_util_replace_whitespace(serial_short, serial_str, sizeof(serial_str));
+			udev_util_replace_chars(serial_str, NULL);
 			printf("ID_SERIAL_SHORT=%s\n", serial_str);
 			printf("ID_TYPE=%s\n", type_str);
 		} else {