Skip to content

port to Windows #42

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
merged 1 commit into from
Mar 2, 2020
Merged

port to Windows #42

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion Sources/ArgumentParser/Parsable Types/ParsableArguments.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@
#if canImport(Glibc)
import Glibc
let _exit: (Int32) -> Never = Glibc.exit
#else
#elseif canImport(Darwin)
import Darwin
let _exit: (Int32) -> Never = Darwin.exit
#elseif canImport(MSVCRT)
import MSVCRT
let _exit: (Int32) -> Never = ucrt._exit
#endif

/// A type that can be parsed from a program's command-line arguments.
Expand Down
29 changes: 18 additions & 11 deletions Sources/ArgumentParser/Usage/HelpGenerator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ internal struct HelpGenerator {
static var helpIndent = 2
static var labelColumnWidth = 26
static var screenWidth: Int {
_screenWidthOverride ?? _terminalWidth()
_screenWidthOverride ?? _terminalSize().width
}

internal static var _screenWidthOverride: Int? = nil
Expand Down Expand Up @@ -252,20 +252,27 @@ import Glibc
func ioctl(_ a: Int32, _ b: Int32, _ p: UnsafeMutableRawPointer) -> Int32 {
ioctl(CInt(a), UInt(b), p)
}
#else
#elseif canImport(Darwin)
import Darwin
#elseif canImport(MSVCRT)
import MSVCRT
import WinSDK
#endif

func _terminalWidth() -> Int {
var w = winsize()
let err = ioctl(STDOUT_FILENO, TIOCGWINSZ, &w)
let result = Int(w.ws_col)
return err == 0 && result > 0 ? result : 80
}
func _terminalSize() -> (width: Int, height: Int) {
#if os(Windows)
var csbi: CONSOLE_SCREEN_BUFFER_INFO = CONSOLE_SCREEN_BUFFER_INFO()

func _terminalHeight() -> Int {
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)
return (width: Int(csbi.srWindow.Right - csbi.srWindow.Left) + 1,
height: Int(csbi.srWindow.Bottom - csbi.srWindow.Top) + 1)
#else
var w = winsize()
let err = ioctl(STDOUT_FILENO, TIOCGWINSZ, &w)
let result = Int(w.ws_row)
return err == 0 && result > 0 ? result : 25
let width = Int(w.ws_col)
let height = Int(w.ws_row)
guard err == 0 else { return (80, 25) }
return (width: width > 0 ? width : 80,
height: height > 0 ? height : 25)
#endif
}