Skip to content

tail: fix -f/-F not following files on Windows (#4827) #13248

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
crutkas wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −16
Open

tail: fix -f/-F not following files on Windows (#4827) #13248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/uu/tail/src/follow/watch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,13 @@ impl Observer {
let display_name = self.files.get(event_path).display_name.clone();

match event.kind {
EventKind::Modify(ModifyKind::Metadata(MetadataKind::Any | MetadataKind::WriteTime) | ModifyKind::Data(DataChange::Any) | ModifyKind::Name(RenameMode::To)) |
// NOTE: `ModifyKind::Any` is emitted by the Windows `ReadDirectoryChangesW`
// backend (for `FILE_ACTION_MODIFIED`) and by the macOS/BSD `kqueue` backend
// (for `NOTE_WRITE`) whenever a watched file's contents change. Without it,
// appends are never followed on those platforms (see GH issue #4827).
// Linux inotify and the polling fallback report the more specific
// `Modify(Data(..))`/`Modify(Metadata(..))` instead, so this is a no-op there.
EventKind::Modify(ModifyKind::Any | ModifyKind::Metadata(MetadataKind::Any | MetadataKind::WriteTime) | ModifyKind::Data(DataChange::Any) | ModifyKind::Name(RenameMode::To)) |
EventKind::Create(CreateKind::File | CreateKind::Folder | CreateKind::Any) => {
if let Ok(new_md) = event_path.metadata() {
let is_tailable = new_md.is_tailable();
Expand Down
17 changes: 2 additions & 15 deletions tests/by-util/test_tail.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ fn test_nc_0_wo_follow2() {
}

#[test]
#[cfg(not(target_os = "windows"))]
fn test_n0_with_follow() {
let (at, mut ucmd) = at_and_ucmd!();
let test_file = "test.txt";
Expand Down Expand Up @@ -501,7 +500,6 @@ fn test_null_default() {
}

#[test]
#[cfg(not(target_os = "windows"))] // FIXME: test times out
fn test_follow_single() {
let (at, mut ucmd) = at_and_ucmd!();

Expand Down Expand Up @@ -589,7 +587,6 @@ fn test_permission_denied_is_not_reported_as_not_found() {
}

#[test]
#[cfg(not(target_os = "windows"))] // FIXME: test times out
fn test_follow_multiple() {
let (at, mut ucmd) = at_and_ucmd!();
let mut child = ucmd
Expand Down Expand Up @@ -625,7 +622,6 @@ fn test_follow_multiple() {
}

#[test]
#[cfg(not(target_os = "windows"))] // FIXME: test times out
fn test_follow_name_multiple() {
// spell-checker:disable-next-line
for argument in ["--follow=name", "--follo=nam", "--f=n"] {
Expand Down Expand Up @@ -2011,11 +2007,7 @@ fn test_follow_name_remove() {
}

#[test]
#[cfg(all(
not(target_os = "windows"),
not(target_os = "android"),
not(target_os = "freebsd")
))] // FIXME: for currently not working platforms
#[cfg(all(not(target_os = "android"), not(target_os = "freebsd")))] // FIXME: for currently not working platforms
fn test_follow_name_truncate1() {
// This test triggers a truncate event while `tail --follow=name file` is running.
// $ cp file backup && head file > file && sleep 1 && cp backup file
Expand Down Expand Up @@ -2052,11 +2044,7 @@ fn test_follow_name_truncate1() {
}

#[test]
#[cfg(all(
not(target_os = "windows"),
not(target_os = "android"),
not(target_os = "freebsd")
))] // FIXME: for currently not working platforms
#[cfg(all(not(target_os = "android"), not(target_os = "freebsd")))] // FIXME: for currently not working platforms
fn test_follow_name_truncate2() {
// This test triggers a truncate event while `tail --follow=name file` is running.
// $ ((sleep 1 && echo -n "x\nx\nx\n" >> file && sleep 1 && \
Expand Down Expand Up @@ -2099,7 +2087,6 @@ fn test_follow_name_truncate2() {
}

#[test]
#[cfg(not(target_os = "windows"))] // FIXME: for currently not working platforms
fn test_follow_name_truncate3() {
// Opening an empty file in truncate mode should not trigger a truncate event while
// `tail --follow=name file` is running.
Expand Down
Loading