Skip to content

[Windows] use _dupenv_s instead of getenv #250

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

Closed
wants to merge 1 commit into from
Closed

[Windows] use _dupenv_s instead of getenv #250

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
8 changes: 8 additions & 0 deletions Sources/ArgumentParser/Completions/CompletionsGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,16 @@ public struct CompletionShell: RawRepresentable, Hashable, CaseIterable {
/// Returns an instance representing the current shell, if recognized.
public static func autodetected() -> CompletionShell? {
// FIXME: This retrieves the user's preferred shell, not necessarily the one currently in use.
#if os(Windows)
var buffer: UnsafeMutablePointer<CChar>?
var length: Int = 0
guard _dupenv_s(&buffer, &length, "SHELL") != 0, let shellVar = buffer else { return nil }
let shellParts = String(cString: shellVar).split(separator: "/")
free(buffer)
Copy link
Collaborator

@compnerd compnerd Oct 24, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would swap the two things, doing a defer { free(buffer) } and then just returning the processed value. However, the separator is unlikely to be / and more likely to be \ if there was such a variable, though it could be either.

#else
guard let shellVar = getenv("SHELL") else { return nil }
let shellParts = String(cString: shellVar).split(separator: "/")
#endif
return CompletionShell(rawValue: String(shellParts.last ?? ""))
}

Expand Down