* [PATCH] Cygwin: /dev/disk/by-id: Remove leading spaces from identify fields
@ 2023-11-08 16:40 Christian Franke
2023-11-08 19:42 ` Corinna Vinschen
0 siblings, 1 reply; 2+ messages in thread
From: Christian Franke @ 2023-11-08 16:40 UTC (permalink / raw)
To: cygwin-patches
[-- Attachment #1: Type: text/plain, Size: 101 bytes --]
Minor improvement, avoids "/dev/disk/by-id/sata-VENDOR_MODEL_______SERIAL".
--
Regards,
Christian
[-- Attachment #2: 0001-Cygwin-dev-disk-by-id-Remove-leading-spaces-from-ide.patch --]
[-- Type: text/plain, Size: 1989 bytes --]
From 9927cd46435da97d234b0c7e97b5fc2a9b7632d1 Mon Sep 17 00:00:00 2001
From: Christian Franke <christian.franke@t-online.de>
Date: Wed, 8 Nov 2023 17:03:57 +0100
Subject: [PATCH] Cygwin: /dev/disk/by-id: Remove leading spaces from identify
fields
Various drives align the serial number to the right of the fixed
length field.
Signed-off-by: Christian Franke <christian.franke@t-online.de>
---
winsup/cygwin/fhandler/dev_disk.cc | 34 ++++++++++++++++++------------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/winsup/cygwin/fhandler/dev_disk.cc b/winsup/cygwin/fhandler/dev_disk.cc
index fcd0de651..11b24042f 100644
--- a/winsup/cygwin/fhandler/dev_disk.cc
+++ b/winsup/cygwin/fhandler/dev_disk.cc
@@ -14,27 +14,33 @@ details. */
#include <wctype.h>
#include <winioctl.h>
-/* Replace non-printing and unexpected characters, remove trailing spaces,
- return remaining string length. */
+/* Replace spaces, non-printing and unexpected characters. Remove
+ leading and trailing spaces. Return remaining string length. */
static int
sanitize_id_string (char *s)
{
- int lastspace = -1, i;
- for (i = 0; s[i]; i++)
+ int first = 0;
+ while (s[first] == ' ')
+ first++;
+ int last = -1, i;
+ for (i = 0; s[first + i]; i++)
{
- char c = s[i];
+ char c = s[first + i];
if (c != ' ')
- lastspace = -1;
- else if (lastspace < 0)
- lastspace = i;
- if (('0' <= c && c <= '9') || c == '.' || c == '-'
- || ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z'))
+ last = -1;
+ else if (last < 0)
+ last = i;
+ if (!(('0' <= c && c <= '9') || c == '.' || c == '-'
+ || ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z')))
+ c = '_';
+ else if (!first)
continue;
- s[i] = '_';
+ s[i] = c;
}
- if (lastspace >= 0)
- s[(i = lastspace)] = '\0';
- return i;
+ if (last < 0)
+ last = i;
+ s[last] = '\0';
+ return last;
}
/* Fetch storage properties and create the ID string.
--
2.42.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Cygwin: /dev/disk/by-id: Remove leading spaces from identify fields
2023-11-08 16:40 [PATCH] Cygwin: /dev/disk/by-id: Remove leading spaces from identify fields Christian Franke
@ 2023-11-08 19:42 ` Corinna Vinschen
0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2023-11-08 19:42 UTC (permalink / raw)
To: Christian Franke; +Cc: cygwin-patches
On Nov 8 17:40, Christian Franke wrote:
> Minor improvement, avoids "/dev/disk/by-id/sata-VENDOR_MODEL_______SERIAL".
Pushed.
Thanks,
Corinna
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-11-08 19:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-08 16:40 [PATCH] Cygwin: /dev/disk/by-id: Remove leading spaces from identify fields Christian Franke
2023-11-08 19:42 ` Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).