linux fixes

src/uu/dd/src/dd.rs

@@ -22,14 +22,13 @@ use nix::fcntl::FcntlArg::F_SETFL;
 use nix::fcntl::OFlag;
 use parseargs::Parser;
 use progress::{gen_prog_updater, ProgUpdate, ReadStat, StatusLevel, WriteStat};
+use uucore::io::OwnedFileDescriptorOrHandle;
 
 use std::cmp;
 use std::env;
 use std::ffi::OsString;
 use std::fs::{File, OpenOptions};
 use std::io::{self, Read, Seek, SeekFrom, Stdout, Write};
-#[cfg(unix)]
-use std::os::fd::{AsFd, OwnedFd};
 #[cfg(any(target_os = "linux", target_os = "android"))]
 use std::os::unix::fs::OpenOptionsExt;
 #[cfg(unix)]
@@ -746,12 +745,13 @@ impl<'a> Output<'a> {
     /// already opened by the system (stdout) and has a state
     /// (current position) that shall be used.
     fn new_file_from_stdout(settings: &'a Settings) -> UResult<Self> {
-        use uucore::io::OwnedFileDescriptorOrHandle;
-
         let fx = OwnedFileDescriptorOrHandle::from(io::stdout())?;
         #[cfg(any(target_os = "linux", target_os = "android"))]
-        if let Some(libc_flags) = make_linux_oflags(_oflags) {
-            nix::fcntl::fcntl(fx.as_raw(), F_SETFL(OFlag::from_bits_retain(libc_flags)))?;
+        if let Some(libc_flags) = make_linux_oflags(&settings.oflags) {
+            nix::fcntl::fcntl(
+                fx.as_raw().as_raw_fd(),
+                F_SETFL(OFlag::from_bits_retain(libc_flags)),
+            )?;
         }
 
         Self::prepare_file(fx.into_file(), settings)

src/uucore/src/lib/mods/io.rs

@@ -3,18 +3,21 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
+#[cfg(not(windows))]
+use std::os::fd::{AsFd, OwnedFd};
+#[cfg(windows)]
+use std::os::windows::io::{AsHandle, OwnedHandle};
 use std::{
     fs::{File, OpenOptions},
     io::{self, Stdout},
-    os::windows::io::{AsHandle, OwnedHandle},
     path::Path,
     process::Stdio,
 };
 
 #[cfg(windows)]
 type XType = OwnedHandle;
 #[cfg(not(windows))]
-type XType = OwnedFileDescriptor;
+type XType = OwnedFd;
 
 pub struct OwnedFileDescriptorOrHandle {
     fx: XType,
@@ -40,7 +43,7 @@ impl OwnedFileDescriptorOrHandle {
     #[cfg(not(windows))]
     pub fn from<T: AsFd>(t: T) -> io::Result<Self> {
         Ok(Self {
-            x: t.as_fd().try_clone_to_owned()?,
+            fx: t.as_fd().try_clone_to_owned()?,
         })
     }