chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
0105b93
)
fold multiple consecutive whitespace chars into single '_'
author
Hannes Reinecke
<hare@suse.de>
Thu, 15 Dec 2005 11:22:42 +0000
(12:22 +0100)
committer
Kay Sievers
<kay.sievers@suse.de>
Thu, 15 Dec 2005 11:22:42 +0000
(12:22 +0100)
extras/scsi_id/scsi_id.c
patch
|
blob
|
history
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)
{
- 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';
}
/*