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

Make errors in the history_file log category human-readable

Browse source
This commit is contained in:
Johannes Altmanninger 2024-10-06 10:59:30 +02:00
parent f36f757fa6
commit 9c4d31f89a
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/history.rs
View file

@ -704,11 +704,18 @@ impl HistoryImpl {
if !can_replace_file { if !can_replace_file {
// The file has changed, so we're going to re-read it // The file has changed, so we're going to re-read it
// Truncate our tmp_file so we can reuse it // Truncate our tmp_file so we can reuse it
if tmp_file.set_len(0).is_err() || tmp_file.seek(SeekFrom::Start(0)).is_err() { if let Err(err) = tmp_file.set_len(0) {
FLOGF!( FLOG!(
history_file, history_file,
"Error %d when truncating temporary history file", "Error when truncating temporary history file:",
errno::errno().0 err
);
}
if let Err(err) = tmp_file.seek(SeekFrom::Start(0)) {
FLOG!(
history_file,
"Error resetting cursor in temporary history file:",
err
); );
} }
} else { } else {
@ -723,20 +730,20 @@ impl HistoryImpl {
if let Ok(target_fd_after) = target_fd_after.as_ref() { if let Ok(target_fd_after) = target_fd_after.as_ref() {
if let Ok(md) = fstat(target_fd_after.as_raw_fd()) { if let Ok(md) = fstat(target_fd_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 {
FLOGF!( FLOG!(
history_file, history_file,
"Error %d when changing ownership of history file", "Error when changing ownership of history file:",
errno::errno().0 errno::errno()
); );
} }
#[allow(clippy::useless_conversion)] #[allow(clippy::useless_conversion)]
if unsafe { fchmod(tmp_file.as_raw_fd(), md.mode().try_into().unwrap()) } if unsafe { fchmod(tmp_file.as_raw_fd(), md.mode().try_into().unwrap()) }
== -1 == -1
{ {
FLOGF!( FLOG!(
history_file, history_file,
"Error %d when changing mode of history file", "Error when changing mode of history file:",
errno::errno().0, errno::errno(),
); );
} }
} }