mirror of
https://github.com/uutils/diffutils.git
synced 2026-06-10 15:48:59 -07:00
50057412bd
The utility should support all the arguments supported by GNU cmp and
perform slightly better.
On a "bad" scenario, ~36M files which are completely different, our
version runs in ~72% of the time of the original on my M1 Max:
> hyperfine --warmup 1 -i --output=pipe \
'cmp -l huge huge.3'
Benchmark 1: cmp -l huge huge.3
Time (mean ± σ): 3.237 s ± 0.014 s [User: 2.891 s, System: 0.341 s]
Range (min … max): 3.221 s … 3.271 s 10 runs
Warning: Ignoring non-zero exit code.
> hyperfine --warmup 1 -i --output=pipe \
'../target/release/diffutils cmp -l huge huge.3'
Benchmark 1: ../target/release/diffutils cmp -l huge huge.3
Time (mean ± σ): 2.392 s ± 0.009 s [User: 1.978 s, System: 0.406 s]
Range (min … max): 2.378 s … 2.406 s 10 runs
Warning: Ignoring non-zero exit code.
Our cmp runs in ~116% of the time when comparing libxul.so to the
chromium-browser binary with -l and -b. In a best case scenario of
comparing 2 files which are the same except for the last byte, our
tool is slightly faster.
99 lines
3.2 KiB
Rust
99 lines
3.2 KiB
Rust
// This file is part of the uutils diffutils package.
|
|
//
|
|
// For the full copyright and license information, please view the LICENSE-*
|
|
// files that was distributed with this source code.
|
|
|
|
use crate::params::{parse_params, Format};
|
|
use crate::utils::report_failure_to_read_input_file;
|
|
use crate::{context_diff, ed_diff, normal_diff, unified_diff};
|
|
use std::env::ArgsOs;
|
|
use std::ffi::OsString;
|
|
use std::fs;
|
|
use std::io::{self, Read, Write};
|
|
use std::iter::Peekable;
|
|
use std::process::{exit, ExitCode};
|
|
|
|
// Exit codes are documented at
|
|
// https://www.gnu.org/software/diffutils/manual/html_node/Invoking-diff.html.
|
|
// An exit status of 0 means no differences were found,
|
|
// 1 means some differences were found,
|
|
// and 2 means trouble.
|
|
pub fn main(opts: Peekable<ArgsOs>) -> ExitCode {
|
|
let params = parse_params(opts).unwrap_or_else(|error| {
|
|
eprintln!("{error}");
|
|
exit(2);
|
|
});
|
|
// if from and to are the same file, no need to perform any comparison
|
|
let maybe_report_identical_files = || {
|
|
if params.report_identical_files {
|
|
println!(
|
|
"Files {} and {} are identical",
|
|
params.from.to_string_lossy(),
|
|
params.to.to_string_lossy(),
|
|
);
|
|
}
|
|
};
|
|
if params.from == "-" && params.to == "-"
|
|
|| same_file::is_same_file(¶ms.from, ¶ms.to).unwrap_or(false)
|
|
{
|
|
maybe_report_identical_files();
|
|
return ExitCode::SUCCESS;
|
|
}
|
|
|
|
// read files
|
|
fn read_file_contents(filepath: &OsString) -> io::Result<Vec<u8>> {
|
|
if filepath == "-" {
|
|
let mut content = Vec::new();
|
|
io::stdin().read_to_end(&mut content).and(Ok(content))
|
|
} else {
|
|
fs::read(filepath)
|
|
}
|
|
}
|
|
let mut io_error = false;
|
|
let from_content = match read_file_contents(¶ms.from) {
|
|
Ok(from_content) => from_content,
|
|
Err(e) => {
|
|
report_failure_to_read_input_file(¶ms.executable, ¶ms.from, &e);
|
|
io_error = true;
|
|
vec![]
|
|
}
|
|
};
|
|
let to_content = match read_file_contents(¶ms.to) {
|
|
Ok(to_content) => to_content,
|
|
Err(e) => {
|
|
report_failure_to_read_input_file(¶ms.executable, ¶ms.to, &e);
|
|
io_error = true;
|
|
vec![]
|
|
}
|
|
};
|
|
if io_error {
|
|
return ExitCode::from(2);
|
|
}
|
|
|
|
// run diff
|
|
let result: Vec<u8> = match params.format {
|
|
Format::Normal => normal_diff::diff(&from_content, &to_content, ¶ms),
|
|
Format::Unified => unified_diff::diff(&from_content, &to_content, ¶ms),
|
|
Format::Context => context_diff::diff(&from_content, &to_content, ¶ms),
|
|
Format::Ed => ed_diff::diff(&from_content, &to_content, ¶ms).unwrap_or_else(|error| {
|
|
eprintln!("{error}");
|
|
exit(2);
|
|
}),
|
|
};
|
|
if params.brief && !result.is_empty() {
|
|
println!(
|
|
"Files {} and {} differ",
|
|
params.from.to_string_lossy(),
|
|
params.to.to_string_lossy()
|
|
);
|
|
} else {
|
|
io::stdout().write_all(&result).unwrap();
|
|
}
|
|
if result.is_empty() {
|
|
maybe_report_identical_files();
|
|
ExitCode::SUCCESS
|
|
} else {
|
|
ExitCode::from(1)
|
|
}
|
|
}
|