RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-27 11:07:44 +00:00
Code Issues Activity

stty: add drain setting

Browse source
This commit is contained in:
Will Shuttleworth 2025-06-30 10:54:05 -04:00
parent 5f0077ecf8
commit 8a6c576fb7
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/uu/stty/src/stty.rs
View file

@ -4,6 +4,7 @@
// file that was distributed with this source code. // file that was distributed with this source code.
// spell-checker:ignore clocal erange tcgetattr tcsetattr tcsanow tiocgwinsz tiocswinsz cfgetospeed cfsetospeed ushort vmin vtime cflag lflag ispeed ospeed // spell-checker:ignore clocal erange tcgetattr tcsetattr tcsanow tiocgwinsz tiocswinsz cfgetospeed cfsetospeed ushort vmin vtime cflag lflag ispeed ospeed
// spell-checker:ignore tcsadrain
mod flags; mod flags;
@ -11,7 +12,7 @@ use crate::flags::AllFlags;
use clap::{Arg, ArgAction, ArgMatches, Command}; use clap::{Arg, ArgAction, ArgMatches, Command};
use nix::libc::{O_NONBLOCK, TIOCGWINSZ, TIOCSWINSZ, c_ushort}; use nix::libc::{O_NONBLOCK, TIOCGWINSZ, TIOCSWINSZ, c_ushort};
use nix::sys::termios::{ use nix::sys::termios::{
ControlFlags, InputFlags, LocalFlags, OutputFlags, SpecialCharacterIndices, Termios, ControlFlags, InputFlags, LocalFlags, OutputFlags, SetArg, SpecialCharacterIndices, Termios,
cfgetospeed, cfsetospeed, tcgetattr, tcsetattr, cfgetospeed, cfsetospeed, tcgetattr, tcsetattr,
}; };
use nix::{ioctl_read_bad, ioctl_write_ptr_bad}; use nix::{ioctl_read_bad, ioctl_write_ptr_bad};
@ -238,6 +239,7 @@ fn stty(opts: &Options) -> UResult<()> {
)); ));
} }
let mut set_arg = SetArg::TCSADRAIN;
let mut valid_args: Vec<ArgOptions> = Vec::new(); let mut valid_args: Vec<ArgOptions> = Vec::new();
if let Some(args) = &opts.settings { if let Some(args) = &opts.settings {
@ -365,6 +367,10 @@ fn stty(opts: &Options) -> UResult<()> {
), ),
)); ));
} }
} else if *arg == "drain" {
set_arg = SetArg::TCSADRAIN;
} else if *arg == "-drain" {
set_arg = SetArg::TCSANOW;
} else if *arg == "size" { } else if *arg == "size" {
valid_args.push(ArgOptions::Print(PrintSetting::Size)); valid_args.push(ArgOptions::Print(PrintSetting::Size));
// not a valid option // not a valid option
@ -395,12 +401,8 @@ fn stty(opts: &Options) -> UResult<()> {
} }
} }
} }
tcsetattr( tcsetattr(opts.file.as_fd(), set_arg, &termios)
opts.file.as_fd(), .expect("Could not write terminal attributes");
nix::sys::termios::SetArg::TCSANOW,
&termios,
)
.expect("Could not write terminal attributes");
} else { } else {
// TODO: Figure out the right error message for when tcgetattr fails // TODO: Figure out the right error message for when tcgetattr fails
let termios = tcgetattr(opts.file.as_fd()).expect("Could not get terminal attributes"); let termios = tcgetattr(opts.file.as_fd()).expect("Could not get terminal attributes");