[6.0] Fix ProcessInfo.processName for Windows (#839) (#840)

iCharlesHu · web-flow · commit 92b84e4c7516 · 2024-08-09T14:32:29.000-07:00
Instead of relying on hard coding PATH_SEPARATOR, use existing .lastPathComponent that already works on Windows
diff --git a/Sources/FoundationEssentials/Platform.swift b/Sources/FoundationEssentials/Platform.swift
@@ -49,8 +49,6 @@ package struct Platform {
         _pageSize
     }
 
-    // FIXME: Windows SEPARATOR
-    static let PATH_SEPARATOR: Character = "/"
     static let MAX_HOSTNAME_LENGTH = 1024
 
     static func roundDownToMultipleOfPageSize(_ size: Int) -> Int {
diff --git a/Sources/FoundationEssentials/ProcessInfo/ProcessInfo.swift b/Sources/FoundationEssentials/ProcessInfo/ProcessInfo.swift
@@ -581,13 +581,7 @@ extension _ProcessInfo {
         guard let processPath = CommandLine.arguments.first else {
             return ""
         }
-
-        if let lastSlash = processPath.lastIndex(of: Platform.PATH_SEPARATOR) {
-            return String(processPath[
-                processPath.index(after: lastSlash) ..< processPath.endIndex])
-        }
-
-        return processPath
+        return processPath.lastPathComponent
     }
 
 #if os(macOS)

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,6 @@ package struct Platform {`
`49`	`49`	`_pageSize`
`50`	`50`	`}`
`51`	`51`
`52`		`- // FIXME: Windows SEPARATOR`
`53`		`- static let PATH_SEPARATOR: Character = "/"`
`54`	`52`	`static let MAX_HOSTNAME_LENGTH = 1024`
`55`	`53`
`56`	`54`	`static func roundDownToMultipleOfPageSize(_ size: Int) -> Int {`
Original file line number	Diff line number	Diff line change
`@@ -581,13 +581,7 @@ extension _ProcessInfo {`
`581`	`581`	`guard let processPath = CommandLine.arguments.first else {`
`582`	`582`	`return ""`
`583`	`583`	`}`
`584`		`-`
`585`		`- if let lastSlash = processPath.lastIndex(of: Platform.PATH_SEPARATOR) {`
`586`		`- return String(processPath[`
`587`		`- processPath.index(after: lastSlash) ..< processPath.endIndex])`
`588`		`- }`
`589`		`-`
`590`		`- return processPath`
	`584`	`+ return processPath.lastPathComponent`
`591`	`585`	`}`
`592`	`586`
`593`	`587`	`#if os(macOS)`