Skip to content

Improve partition name extraction logic #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredkiefer merged 1 commit into from
Jul 14, 2026
Merged

Improve partition name extraction logic #381

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 51 additions & 4 deletions Source/NSWorkspace.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<abstract>Workspace class</abstract>

Copyright (C) 1996-2016 Free Software Foundation, Inc.
Copyright (C) 1996-2026 Free Software Foundation, Inc.

Author: Scott Christley <scottc@net-community.com>
Date: 1996
Expand Down Expand Up @@ -482,6 +482,7 @@ - (BOOL) _launchApplication: (NSString*)appName
arguments: (NSArray*)args;
- (id) _connectApplication: (NSString*)appName;
- (id) _workspaceApplication;
- (NSString*) _stripPartitionSuffixFromDeviceName: (NSString*)devName;

@end

Expand Down Expand Up @@ -1287,11 +1288,13 @@ - (BOOL) getFileSystemInfoForPath: (NSString*)fullPath

r = NO;
devName = [fsName lastPathComponent];
// This is a very crude way of removing the partition number
if ([devName length] > 3)
devName = [devName substringToIndex: 3];

Comment thread
fredkiefer marked this conversation as resolved.
/* Extract block device name by removing partition suffix */
devName = [self _stripPartitionSuffixFromDeviceName: devName];
/* For other devices (loop, ram, sr, etc.), use as-is */

devInfoPath = [@"/sys/block" stringByAppendingPathComponent:devName];

devInfoPath = [devInfoPath stringByAppendingPathComponent:@"removable"];

removableString = [[NSString alloc] initWithContentsOfFile:devInfoPath];
Expand Down Expand Up @@ -3655,4 +3658,48 @@ - (id) _workspaceApplication
return app;
}

- (NSString*) _stripPartitionSuffixFromDeviceName: (NSString*)devName
{
/* Handle various device naming schemes:
* sd*, hd*, vd*, xvd* → remove trailing digits (sda1 → sda)
* nvme*n*p* → remove trailing p<digits> (nvme0n1p1 → nvme0n1)
* mmcblk*p* → remove trailing p<digits> (mmcblk0p1 → mmcblk0)
* loop*, ram*, sr* → use as-is
*/
if ([devName hasPrefix:@"nvme"] || [devName hasPrefix:@"mmcblk"])
{
/* For nvme and mmcblk devices, partition names have a 'p' separator
* e.g., nvme0n1p1, mmcblk0p1 */
NSRange pRange = [devName rangeOfString:@"p" options:NSBackwardsSearch];
if (pRange.location != NSNotFound)
{
/* Check if everything after 'p' is digits */
NSString *suffix = [devName substringFromIndex:pRange.location + 1];
NSCharacterSet *nonDigits = [[NSCharacterSet decimalDigitCharacterSet] invertedSet];
if ([suffix rangeOfCharacterFromSet:nonDigits].location == NSNotFound && [suffix length] > 0)
{
/* It's a partition, strip it */
devName = [devName substringToIndex:pRange.location];
}
}
}
else if ([devName hasPrefix:@"sd"] || [devName hasPrefix:@"hd"] ||
[devName hasPrefix:@"vd"] || [devName hasPrefix:@"xvd"])
{
/* For sd/hd/vd/xvd devices, remove trailing digits (sda1 → sda) */
NSCharacterSet *digits = [NSCharacterSet decimalDigitCharacterSet];
NSInteger i = [devName length] - 1;
while (i >= 0 && [digits characterIsMember:[devName characterAtIndex:i]])
{
i--;
}
if (i < (NSInteger)[devName length] - 1)
{
/* Found trailing digits, strip them */
devName = [devName substringToIndex:i + 1];
}
}
return devName;
}

@end
Loading