Skip to content

Conversation

@mattsu2020
Copy link
Contributor

Summary

Make touch open regular files for write and call futimens on the fd (Unix only). This matches GNU touch behavior and ensures inotify emits IN_CLOSE_WRITE when timestamps are updated.

Motivation

Some inotify-based reloaders watch only IN_CLOSE_WRITE. With the current path-based timestamp update, touch emits only IN_ATTRIB, so those watchers miss the change. This caused infinite loops in downstream tests (e.g., 0 A.D. hotload tests on Ubuntu Questing).

Changes

  • On Unix, attempt OpenOptions::new().write(true) and call futimens on the fd for regular files.
  • Fallback to the existing set_file_times path-based update when open/futimens fails or the target is not a regular file.
  • Keep existing symlink handling intact.

Testing

  • cargo test -p uu_touch

Notes

  • Behavior is Unix-only and preserves current semantics on non-Unix platforms.

related
#9812

…inux

- Add `try_futimens_via_write_fd` function for Unix systems to open files write-only and set times using `futimens`, ensuring inotify watchers detect file closure after touch.
- Modify `update_times` to attempt this method before falling back to `set_file_times`, improving compatibility with file monitoring tools on Linux.
- Include necessary imports for Unix-specific operations.
- Updated the spell-checker comment to include 'futimens', likely a system call or function name, to avoid false positives in code spell-checking.
},
];

let rc = unsafe { libc::futimens(file.as_raw_fd(), times.as_ptr()) };
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix

}

#[cfg(unix)]
fn try_futimens_via_write_fd(path: &Path, atime: FileTime, mtime: FileTime) -> std::io::Result<()> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please document this function. and explain what is futimens

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add

@sylvestre
Copy link
Contributor

is it possible to add tests ? thanks

…time setting

- Add nix and tempfile dependencies to Cargo.toml and Cargo.lock
- Replace unsafe libc::futimens calls with nix::sys::stat::futimens for better safety and portability
- Introduce try_futimens_via_write_fd function using nix abstractions
- Add unit tests to verify futimens functionality on Unix systems

This change reduces unsafe code usage and leverages a Rust-friendly library for Unix-specific operations.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants