h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-29 18:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Add flog category for history *file*

Browse Source
This commit is contained in:
Fabian Homborg
2020-01-19 13:49:56 +01:00
parent 6793d35340
commit 123676075f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/flog.h
View File

@@ -83,6 +83,7 @@ class category_list_t {
category_t char_encoding{L"char-encoding", L"Character encoding issues"};
category_t history{L"history", L"Command history events"};
category_t history_file{L"history-file", L"Reading/Writing the history file"};
category_t profile_history{L"profile-history", L"History performance measurements"};

12
src/history.cpp
View File

@@ -718,7 +718,7 @@ bool history_impl_t::rewrite_to_temporary_file(int existing_fd, int dst_fd) cons
err = flush_to_fd(&buffer, dst_fd, 0);
}
if (err) {
debug(2, L"Error %d when writing to temporary history file", err);
FLOGF(history_file, L"Error %d when writing to temporary history file", err);
}
return err == 0;
@@ -790,7 +790,7 @@ bool history_impl_t::save_internal_via_rewrite() {
// The file has changed, so we're going to re-read it
// Truncate our tmp_fd so we can reuse it
if (ftruncate(tmp_fd, 0) == -1 || lseek(tmp_fd, 0, SEEK_SET) == -1) {
debug(2, L"Error %d when truncating temporary history file", errno);
FLOGF(history_file, L"Error %d when truncating temporary history file", errno);
}
} else {
// The file is unchanged, or the new file doesn't exist or we can't read it
@@ -804,16 +804,16 @@ bool history_impl_t::save_internal_via_rewrite() {
struct stat sbuf;
if (target_fd_after.valid() && fstat(target_fd_after.fd(), &sbuf) >= 0) {
if (fchown(tmp_fd, sbuf.st_uid, sbuf.st_gid) == -1) {
debug(2, L"Error %d when changing ownership of history file", errno);
FLOGF(history_file, L"Error %d when changing ownership of history file", errno);
}
if (fchmod(tmp_fd, sbuf.st_mode) == -1) {
debug(2, L"Error %d when changing mode of history file", errno);
FLOGF(history_file, L"Error %d when changing mode of history file", errno);
}
}
// Slide it into place
if (wrename(tmp_name, *target_name) == -1) {
debug(2, L"Error %d when renaming history file", errno);
FLOGF(history_file, L"Error %d when renaming history file", errno);
}
// We did it
@@ -1081,7 +1081,7 @@ void history_impl_t::populate_from_config_path() {
ssize_t written = write(dst_fd.fd(), buf, static_cast<size_t>(size));
if (written < 0) {
// This message does not have high enough priority to be shown by default.
debug(2, L"Error when writing history file");
FLOGF(history_file, L"Error when writing history file");
break;
}
}