Skip to content
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.

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

sort: wait when SIGINT was raised for the program to finish properly #3801

Merged
merged 3 commits into from
Aug 10, 2022
Merged
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
6 changes: 5 additions & 1 deletion src/uu/sort/src/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1267,7 +1267,11 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {

settings.init_precomputed();

exec(&mut files, &settings, output, &mut tmp_dir)
let result = exec(&mut files, &settings, output, &mut tmp_dir);
// Wait here if `SIGINT` was received,
// for signal handler to do its work and terminate the program.
tmp_dir.wait_if_signal();
niyaznigmatullin marked this conversation as resolved.
Show resolved Hide resolved
result
}

pub fn uu_app<'a>() -> Command<'a> {
Expand Down
8 changes: 7 additions & 1 deletion src/uu/sort/src/tmp_dir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ impl TmpDirWrapper {
let path = self.temp_dir.as_ref().unwrap().path().to_owned();
let lock = self.lock.clone();
ctrlc::set_handler(move || {
// Take the lock so that `next_file_path` returns no new file path.
// Take the lock so that `next_file_path` returns no new file path,
// and the program doesn't terminate before the handler has finished
let _lock = lock.lock().unwrap();
if let Err(e) = remove_tmp_dir(&path) {
show_error!("failed to delete temporary directory: {}", e);
Expand All @@ -69,6 +70,11 @@ impl TmpDirWrapper {
path,
))
}

/// Function just waits if signal handler was called
pub fn wait_if_signal(&self) {
let _lock = self.lock.lock().unwrap();
}
}

/// Remove the directory at `path` by deleting its child files and then itself.
Expand Down