Skip to content

[sed]: requested adjustments #406

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[sed]: requested adjustments #406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1340d1b
[sed]: requested adjustments
Wandalen Apr 11, 2025
315c8e4
[sed]: fix regression
Wandalen Apr 12, 2025
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
32 changes: 31 additions & 1 deletion text/sed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ use std::{
path::PathBuf,
};

const DEFAULT_TMP_DIR: &str = "../target/tmp";

static ERE: Mutex<bool> = Mutex::new(false);

#[derive(Parser, Debug, Clone)]
Expand Down Expand Up @@ -1346,7 +1348,7 @@ fn print_multiline_binary(line: &str) {
}
}
}
} else if let Some(line) = line.strip_suffix(&['\n']) {
} else if let Some(line) = line.strip_suffix(['\n']) {
println!("{}$", line);
} else {
print!("{}$", line);
Expand Down Expand Up @@ -1416,6 +1418,16 @@ fn filter_comments(raw_script: impl AsRef<str>) -> String {
raw_script_without_comments
}

/// Get path to [`wfile`] in tmp dir
fn get_tmp_path(wfile: PathBuf) -> PathBuf {
let mut tmp_path =
PathBuf::from(std::env::var("CARGO_TARGET_TMPDIR").unwrap_or(DEFAULT_TMP_DIR.to_string()));

tmp_path.extend(&wfile);

tmp_path
}

/// Contains [`Command`] sequence of all [`Sed`] session
/// that applied all to every line of input files
#[derive(Debug)]
Expand Down Expand Up @@ -1821,6 +1833,15 @@ fn execute_replace(
Some(wfile)
}) {
if replace && wfile.components().next().is_some() {
let mut wfile = wfile.clone();
if !(wfile.is_absolute()
|| wfile.starts_with("./")
|| wfile.starts_with("../")
|| wfile.exists())
{
wfile = get_tmp_path(wfile);
}

if let Ok(mut file) = std::fs::OpenOptions::new()
.append(true)
.create(true)
Expand Down Expand Up @@ -2213,6 +2234,15 @@ impl Sed {
}

fn execute_w(&mut self, wfile: PathBuf) -> Result<(), SedError> {
let mut wfile = wfile.clone();
if !(wfile.is_absolute()
|| wfile.starts_with("./")
|| wfile.starts_with("../")
|| wfile.exists())
{
wfile = get_tmp_path(wfile);
}

let _ = match std::fs::OpenOptions::new()
.append(true)
.create(true)
Expand Down
9 changes: 7 additions & 2 deletions text/tests/sed/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1825,12 +1825,17 @@ mod tests {
fn test_w() {
let test_data = [
// correct
("w ./tests/sed/assets/newfile", "abc\ncdf\n", "abc\ncdf\n", ""),
("w atyfv", "abc\ncdf\n", "abc\ncdf\n", ""),
("w./tests/sed/assets/r", "", "", ""),
("w./tests/sed/assets/newfile", "a\n", "a\n", ""),
("w newfile", "a\n", "a\n", ""),
("w ; h", "abc\ncdf\n", "abc\ncdf\n", ""),
// wrong
(
"w ./dir/newfile",
"abc\ncdf\n",
"",
"sed: read stdin: can't find './dir/newfile': no such file or directory (os error 2)\n",
),
(
"w./tests/s\x04ed/assets/abc",
"a\n",
Expand Down