Merge pull request #8037 from martinkunkel2/main
Some checks are pending
CICD / Style/cargo-deny (push) Waiting to run
CICD / Style/deps (push) Waiting to run
CICD / Documentation/warnings (push) Waiting to run
CICD / MinRustV (push) Waiting to run
CICD / Dependencies (push) Waiting to run
CICD / Build/Makefile (push) Blocked by required conditions
CICD / Build/stable (push) Blocked by required conditions
CICD / Build/nightly (push) Blocked by required conditions
CICD / Binary sizes (push) Blocked by required conditions
CICD / Build (push) Blocked by required conditions
CICD / Tests/BusyBox test suite (push) Blocked by required conditions
CICD / Tests/Toybox test suite (push) Blocked by required conditions
CICD / Code Coverage (push) Waiting to run
CICD / Separate Builds (push) Waiting to run
CICD / Test all features separately (push) Blocked by required conditions
CICD / Build/SELinux (push) Blocked by required conditions
GnuTests / Run GNU tests (push) Waiting to run
Android / Test builds (push) Waiting to run
Code Quality / Style/format (push) Waiting to run
Code Quality / Style/lint (push) Waiting to run
Code Quality / Style/spelling (push) Waiting to run
Code Quality / Style/toml (push) Waiting to run
Code Quality / Style/Python (push) Waiting to run
Code Quality / Pre-commit hooks (push) Waiting to run
FreeBSD / Style and Lint (push) Waiting to run
FreeBSD / Tests (push) Waiting to run

tail: show end of device
This commit is contained in:
Daniel Hofstetter 2025-07-17 10:45:31 +02:00 committed by GitHub
commit 213389c8ec
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -177,7 +177,7 @@ fn tail_file(
return Ok(());
}
observer.add_bad_path(path, input.display_name.as_str(), false)?;
} else if input.is_tailable() {
} else {
match File::open(path) {
Ok(mut file) => {
let st = file.metadata()?;
@ -194,12 +194,16 @@ fn tail_file(
reader = BufReader::new(file);
unbounded_tail(&mut reader, settings)?;
}
observer.add_path(
path,
input.display_name.as_str(),
Some(Box::new(reader)),
true,
)?;
if input.is_tailable() {
observer.add_path(
path,
input.display_name.as_str(),
Some(Box::new(reader)),
true,
)?;
} else {
observer.add_bad_path(path, input.display_name.as_str(), false)?;
}
}
Err(e) if e.kind() == ErrorKind::PermissionDenied => {
observer.add_bad_path(path, input.display_name.as_str(), false)?;
@ -220,8 +224,6 @@ fn tail_file(
}));
}
}
} else {
observer.add_bad_path(path, input.display_name.as_str(), false)?;
}
Ok(())