Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 13:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

history: rename target_fd_after to target_file_after

Browse source 
This was forgotten in decf99f71 (Use `File` instead of `OwnedFd` in a few
places (#10355), 2024-03-17).
This commit is contained in:
Johannes Altmanninger 2024-10-09 14:31:46 +02:00
parent f906a949cf
commit 35ee5e661f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/history.rs
View file

@ -693,15 +693,15 @@ impl HistoryImpl {
// If the open fails, then proceed; this may be because there is no current history // If the open fails, then proceed; this may be because there is no current history
let mut new_file_id = INVALID_FILE_ID; let mut new_file_id = INVALID_FILE_ID;
let mut target_fd_after = wopen_cloexec(&target_name, OFlag::O_RDONLY, Mode::empty()); let mut target_file_after = wopen_cloexec(&target_name, OFlag::O_RDONLY, Mode::empty());
if let Ok(target_fd_after) = target_fd_after.as_mut() { if let Ok(target_file_after) = target_file_after.as_mut() {
// critical to take the lock before checking file IDs, // critical to take the lock before checking file IDs,
// and hold it until after we are done replacing. // and hold it until after we are done replacing.
// Also critical to check the file at the path, NOT based on our fd. // Also critical to check the file at the path, NOT based on our fd.
// It's only OK to replace the file while holding the lock. // It's only OK to replace the file while holding the lock.
// Note any lock is released when target_fd_after is closed. // Note any lock is released when target_file_after is closed.
unsafe { unsafe {
Self::maybe_lock_file(target_fd_after, LOCK_EX); Self::maybe_lock_file(target_file_after, LOCK_EX);
} }
new_file_id = match file_id_for_path_or_error(&target_name) { new_file_id = match file_id_for_path_or_error(&target_name) {
Ok(file_id) => file_id, Ok(file_id) => file_id,
@ -741,8 +741,8 @@ impl HistoryImpl {
// corresponds to e.g. someone running sudo -E as the very first command. If they // corresponds to e.g. someone running sudo -E as the very first command. If they
// did, it would be tricky to set the permissions correctly. (bash doesn't get this // did, it would be tricky to set the permissions correctly. (bash doesn't get this
// case right either). // case right either).
if let Ok(target_fd_after) = target_fd_after.as_ref() { if let Ok(target_file_after) = target_file_after.as_ref() {
if let Ok(md) = fstat(target_fd_after.as_raw_fd()) { if let Ok(md) = fstat(target_file_after.as_raw_fd()) {
if unsafe { fchown(tmp_file.as_raw_fd(), md.uid(), md.gid()) } == -1 { if unsafe { fchown(tmp_file.as_raw_fd(), md.uid(), md.gid()) } == -1 {
FLOG!( FLOG!(
history_file, history_file,