fold multiple consecutive whitespace chars into single '_'

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index 39391f6e2e0102a9fb89571987dadbd9607fc669..aa1b16009e9f989cd301dfe9d78acd16391de767 100644 (file)
--- 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)
 {
  */
 static void format_serial(char *serial)
 {

-       char *p = serial;
+       char *p = serial, *q;

 
 

+       q = p;

        while (*p != '\0') {
        while (*p != '\0') {

-               if (isspace(*p))
-                       *p = '_';
+               if (isspace(*p)) {
+                       if (q > serial && q[-1] != '_') {
+                               *q = '_';
+                               q++;
+                       }
+               } else {
+                       *q = *p;
+                       q++;
+               }

                p++;
        }
                p++;
        }

+       *q = '\0';

 }
 
 /*
 }
 
 /*