X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fscsi_id%2Fscsi_id.c;h=aa1b16009e9f989cd301dfe9d78acd16391de767;hp=39391f6e2e0102a9fb89571987dadbd9607fc669;hb=d313632b04e2277306af74738df0b4444bcad695;hpb=0e5f8a1fcc4b2bb020d865075bb8e543f5b0c230

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 39391f6e2..aa1b16009 100644
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -677,13 +677,22 @@ static int per_dev_options(struct sysfs_device *scsi_dev, int *good_bad,
  */
 static void format_serial(char *serial)
 {
-	char *p = serial;
+	char *p = serial, *q;
 
+	q = p;
 	while (*p != '\0') {
-		if (isspace(*p))
-			*p = '_';
+		if (isspace(*p)) {
+			if (q > serial && q[-1] != '_') {
+				*q = '_';
+				q++;
+			}
+		} else {
+			*q = *p;
+			q++;
+		}
 		p++;
 	}
+	*q = '\0';
 }
 
 /*