Skip to content

Commit

Permalink
chore: use is_terminal in atty (denoland#21010)
Browse files Browse the repository at this point in the history
  • Loading branch information
littledivy authored Oct 29, 2023
1 parent 857e084 commit f3b580d
Showing 1 changed file with 1 addition and 20 deletions.
21 changes: 1 addition & 20 deletions runtime/ops/tty.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.

use std::io::Error;
use std::io::IsTerminal;

use deno_core::error::AnyError;
use deno_core::op2;
use deno_core::OpState;
use deno_core::ResourceHandle;

#[cfg(unix)]
use deno_core::ResourceId;
Expand Down Expand Up @@ -167,24 +165,7 @@ fn op_stdin_set_raw(
#[op2(fast)]
fn op_isatty(state: &mut OpState, rid: u32) -> Result<bool, AnyError> {
let handle = state.resource_table.get_handle(rid)?;
// TODO(mmastrac): this can migrate to the deno_core implementation when it lands
Ok(match handle {
ResourceHandle::Fd(fd) if handle.is_valid() => {
#[cfg(windows)]
{
// SAFETY: The resource remains open for the for the duration of borrow_raw
unsafe {
std::os::windows::io::BorrowedHandle::borrow_raw(fd).is_terminal()
}
}
#[cfg(unix)]
{
// SAFETY: The resource remains open for the for the duration of borrow_raw
unsafe { std::os::fd::BorrowedFd::borrow_raw(fd).is_terminal() }
}
}
_ => false,
})
Ok(handle.is_terminal())
}

#[op2(fast)]
Expand Down

0 comments on commit f3b580d

Please sign in to comment.