|
|
@@ -23,7 +23,7 @@
|
|
|
|
|
|
use std::env;
|
|
|
use std::ffi::{OsStr, OsString};
|
|
|
-use std::io::{self, ErrorKind, Write};
|
|
|
+use std::io::{self, ErrorKind, IsTerminal, Write};
|
|
|
use std::path::{Component, PathBuf};
|
|
|
use std::process::exit;
|
|
|
|
|
|
@@ -57,20 +57,8 @@ fn main() {
|
|
|
if let Err(e) = ansiterm::enable_ansi_support() {
|
|
|
warn!("Failed to enable ANSI support: {}", e);
|
|
|
}
|
|
|
- #[cfg(unix)]
|
|
|
- let stdout_istty = {
|
|
|
- use std::os::fd::AsRawFd;
|
|
|
- terminal_size::terminal_size_using_fd(io::stdout().as_raw_fd()).is_some()
|
|
|
- };
|
|
|
- #[cfg(windows)]
|
|
|
- let stdout_istty = {
|
|
|
- use std::os::windows::io::RawHandle;
|
|
|
- use windows_sys::Win32::System::Console::{GetStdHandle, STD_OUTPUT_HANDLE};
|
|
|
- terminal_size::terminal_size_using_handle(unsafe {
|
|
|
- GetStdHandle(STD_OUTPUT_HANDLE) as RawHandle
|
|
|
- })
|
|
|
- .is_some()
|
|
|
- };
|
|
|
+
|
|
|
+ let stdout_istty = io::stdout().is_terminal();
|
|
|
|
|
|
let args: Vec<_> = env::args_os().skip(1).collect();
|
|
|
match Options::parse(args.iter().map(std::convert::AsRef::as_ref), &LiveVars) {
|