ascendforever/lndups
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

file comparison code cleaned u & related function signatures more logical

Browse source
This commit is contained in:
ascendforever 2024-10-13 16:22:10 -04:00
parent 94fbb42829
commit c5f5d20ed6
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/main.rs
View file

@ -259,7 +259,7 @@ fn run(paths: Vec<PathBuf>, cfg: &Config) {
let f1 = &files[i]; let f1 = &files[i];
for j in (0..i).rev() { for j in (0..i).rev() {
let f2 = &files[j]; let f2 = &files[j];
if !are_hardlinked(f1, f2) && cmp(f1, f2) { if !are_hardlinked(f1, f2) && cmp(f1, f2).unwrap_or(false) {
if !cfg.dry_run { if !cfg.dry_run {
if let Err(msg) = hardlink(f1, f2) { if let Err(msg) = hardlink(f1, f2) {
eprintln!("{}: {}", msg, format_pair(f1, f2, cfg)); eprintln!("{}: {}", msg, format_pair(f1, f2, cfg));
@ -374,33 +374,27 @@ fn are_hardlinked(f1: &PathBuf, f2: &PathBuf) -> bool {
/// check equality of contents of two paths to files /// check equality of contents of two paths to files
fn cmp(f1: &PathBuf, f2: &PathBuf) -> bool { fn cmp(f1: &PathBuf, f2: &PathBuf) -> std::io::Result<bool> {
if let (Ok(mut f1), Ok(mut f2)) = (std::fs::File::open(f1), std::fs::File::open(f2)) { if let (Ok(mut f1), Ok(mut f2)) = (std::fs::File::open(f1), std::fs::File::open(f2)) {
cmp_files(&mut f1, &mut f2) cmp_files(&mut f1, &mut f2)
} else { false } } else { Ok(false) }
} }
/// check equality of contents of two open files /// check equality of contents of two open files
fn cmp_files(f1: &mut std::fs::File, f2: &mut std::fs::File) -> bool { fn cmp_files(f1: &mut std::fs::File, f2: &mut std::fs::File) -> std::io::Result<bool> {
let buff1: &mut[u8] = &mut [0; 1024]; let buff1: &mut [u8] = &mut [0; 1024];
let buff2: &mut[u8] = &mut [0; 1024]; let buff2: &mut [u8] = &mut [0; 1024];
loop { loop {
match f1.read(buff1) { let l1 = f1.read(buff1)?;
Err(_) => return false, let l2 = f2.read(buff2)?;
Ok(readlen1) => match f2.read(buff2) { if l1 != l2 { // different sizes
Err(_) => return false, return Ok(false);
Ok(readlen2) => {
if readlen1 != readlen2 {
return false;
}
if readlen1 == 0 {
return true;
}
if &buff1[0..readlen1] != &buff2[0..readlen2] {
return false;
}
} }
if l1 == 0 { // end of both files
return Ok(true);
} }
if &buff1[0..l1] != &buff2[0..l2] { // compare data
return Ok(false);
} }
} }
} }