Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 13 additions & 0 deletions src/uu/sync/src/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ mod platform {
pub fn do_fdatasync(files: &[String]) -> UResult<()> {
do_sync_with(files, rustix::fs::fdatasync)
}

#[cfg(any(target_os = "linux", target_os = "android"))]
pub fn do_fsync(files: &[String]) -> UResult<()> {
do_sync_with(files, rustix::fs::fsync)
}
}

#[cfg(windows)]
Expand Down Expand Up @@ -255,6 +260,9 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
} else if matches.get_flag(options::DATA) {
#[cfg(any(target_os = "linux", target_os = "android"))]
fdatasync(&files)?;
} else if !files.is_empty() {
#[cfg(any(target_os = "linux", target_os = "android"))]

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We probably should keep sync fallback on other targets.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We could remove this cfg using std::fs::File::sync_data instead of rustix. I'm working on it at #15733 .

fsync(&files)?;
} else {
sync()?;
}
Expand Down Expand Up @@ -304,3 +312,8 @@ fn syncfs(files: &[String]) -> UResult<()> {
fn fdatasync(files: &[String]) -> UResult<()> {
platform::do_fdatasync(files)
}

#[cfg(any(target_os = "linux", target_os = "android"))]
fn fsync(files: &[String]) -> UResult<()> {
platform::do_fsync(files)
}
13 changes: 13 additions & 0 deletions tests/by-util/test_sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,19 @@ fn test_sync_fdatasync_error_handling() {
.stderr_contains("error opening");
}

#[cfg(any(target_os = "linux", target_os = "android"))]
#[test]
fn test_sync_file_operands_fsync_each_file() {
// Regression test: `sync FILE` (no -d/-f flags) must fsync each file
// like GNU coreutils, not fall back to a global sync() that ignores
// the operands. /proc/self/mem rejects fsync() with EINVAL, so this

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
// the operands. /proc/self/mem rejects fsync() with EINVAL, so this
// the operands. /dev/null rejects fsync() with EINVAL, so this

// must fail; a global sync() would wrongly exit 0.
new_ucmd!()
.arg("/dev/null")
.fails_with_code(1)
.stderr_contains("error syncing");
}

#[cfg(target_vendor = "apple")]
#[test]
fn test_sync_syncfs_error_handling_macos() {
Expand Down