From 88873d82c8b078a6b4a1b43bc7930cff858a8a64 Mon Sep 17 00:00:00 2001 From: Arvid Norlander Date: Tue, 21 Feb 2023 17:32:17 +0100 Subject: [PATCH] stty: Drop direct libc dependency. --- src/uu/stty/Cargo.toml | 1 - src/uu/stty/src/stty.rs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/uu/stty/Cargo.toml b/src/uu/stty/Cargo.toml index b6807754932..9c94f8cb16a 100644 --- a/src/uu/stty/Cargo.toml +++ b/src/uu/stty/Cargo.toml @@ -16,7 +16,6 @@ path = "src/stty.rs" [dependencies] clap = { workspace=true } -libc = { workspace=true } uucore = { workspace=true } nix = { workspace=true, features = ["term", "ioctl"] } diff --git a/src/uu/stty/src/stty.rs b/src/uu/stty/src/stty.rs index 877c928b4ba..9e21d347a2e 100644 --- a/src/uu/stty/src/stty.rs +++ b/src/uu/stty/src/stty.rs @@ -8,7 +8,7 @@ mod flags; use clap::{crate_version, Arg, ArgAction, ArgMatches, Command}; -use nix::libc::{c_ushort, TIOCGWINSZ, TIOCSWINSZ}; +use nix::libc::{c_ushort, O_NONBLOCK, TIOCGWINSZ, TIOCSWINSZ}; use nix::sys::termios::{ cfgetospeed, tcgetattr, tcsetattr, ControlFlags, InputFlags, LocalFlags, OutputFlags, Termios, }; @@ -114,7 +114,7 @@ impl<'a> Options<'a> { // BorrowedFd/OwnedFd to handle both cases. Some(f) => std::fs::OpenOptions::new() .read(true) - .custom_flags(libc::O_NONBLOCK) + .custom_flags(O_NONBLOCK) .open(f)? .into_raw_fd(), None => stdout().as_raw_fd(),