Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cat: error when output is input and appending #7260

Merged
merged 2 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 38 additions & 13 deletions src/uu/cat/src/cat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,31 @@
// file that was distributed with this source code.

// spell-checker:ignore (ToDO) nonprint nonblank nonprinting ELOOP
use clap::{crate_version, Arg, ArgAction, Command};
use std::fs::{metadata, File};
use std::io::{self, IsTerminal, Read, Write};
use thiserror::Error;
use uucore::display::Quotable;
use uucore::error::UResult;
use uucore::fs::FileInformation;

#[cfg(unix)]
use std::os::fd::{AsFd, AsRawFd};

/// Linux splice support
#[cfg(any(target_os = "linux", target_os = "android"))]
mod splice;

/// Unix domain socket support
#[cfg(unix)]
use std::net::Shutdown;
#[cfg(unix)]
use std::os::fd::{AsFd, AsRawFd};
#[cfg(unix)]
use std::os::unix::fs::FileTypeExt;
#[cfg(unix)]
use std::os::unix::net::UnixStream;

use clap::{crate_version, Arg, ArgAction, Command};
#[cfg(unix)]
use nix::fcntl::{fcntl, FcntlArg};
use thiserror::Error;
use uucore::display::Quotable;
use uucore::error::UResult;
use uucore::fs::FileInformation;
use uucore::{format_usage, help_about, help_usage};

/// Linux splice support
#[cfg(any(target_os = "linux", target_os = "android"))]
mod splice;

const USAGE: &str = help_usage!("cat.md");
const ABOUT: &str = help_about!("cat.md");

Expand Down Expand Up @@ -322,6 +323,24 @@ fn cat_handle<R: FdReadable>(
}
}

/// Whether this process is appending to stdout.
#[cfg(unix)]
fn is_appending() -> bool {
let stdout = std::io::stdout();
let flags = match fcntl(stdout.as_raw_fd(), FcntlArg::F_GETFL) {
Ok(flags) => flags,
Err(_) => return false,
};
// TODO Replace `1 << 10` with `nix::fcntl::Oflag::O_APPEND`.
let o_append = 1 << 10;
(flags & o_append) > 0
}

#[cfg(not(unix))]
fn is_appending() -> bool {
false
}

fn cat_path(
path: &str,
options: &OutputOptions,
Expand All @@ -331,10 +350,16 @@ fn cat_path(
match get_input_type(path)? {
InputType::StdIn => {
let stdin = io::stdin();
let in_info = FileInformation::from_file(&stdin)?;
let mut handle = InputHandle {
reader: stdin,
is_interactive: std::io::stdin().is_terminal(),
};
if let Some(out_info) = out_info {
if in_info == *out_info && is_appending() {
return Err(CatError::OutputIsInput);
}
}
cat_handle(&mut handle, options, state)
}
InputType::Directory => Err(CatError::IsDirectory),
Expand Down
22 changes: 22 additions & 0 deletions tests/by-util/test_cat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ use crate::common::util::vec_of_size;
use crate::common::util::TestScenario;
#[cfg(any(target_os = "linux", target_os = "android"))]
use rlimit::Resource;
#[cfg(target_os = "linux")]
use std::fs::File;
use std::fs::OpenOptions;
#[cfg(not(windows))]
use std::process::Stdio;
Expand Down Expand Up @@ -646,3 +648,23 @@ fn test_u_ignored() {
.stdout_only("hello");
}
}

#[test]
#[cfg(target_os = "linux")]
fn test_appending_same_input_output() {
let (at, mut ucmd) = at_and_ucmd!();

at.write("foo", "content");
let foo_file = at.plus_as_string("foo");

let file_read = File::open(&foo_file).unwrap();
let file_write = OpenOptions::new().append(true).open(&foo_file).unwrap();

ucmd.set_stdin(file_read);
ucmd.set_stdout(file_write);

ucmd.run()
.failure()
.no_stdout()
.stderr_contains("input file is output file");
}
Loading