44 lines
999 B
Diff
44 lines
999 B
Diff
From c5ad6be530f5c1daf64a2d20df4baba9f6b57aa4 Mon Sep 17 00:00:00 2001
|
|
From: Chet Ramey <chet.ramey@case.edu>
|
|
Date: Fri, 7 Feb 2020 14:58:55 -0500
|
|
Subject: [PATCH 4/4] problems restoring the history file are not signaled
|
|
correctly to the calling application
|
|
|
|
---
|
|
histfile.c | 2 ++
|
|
patchlevel | 2 +-
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/histfile.c b/histfile.c
|
|
index 6c3adc9..8eb3496 100644
|
|
--- a/histfile.c
|
|
+++ b/histfile.c
|
|
@@ -620,6 +620,7 @@ history_truncate_file (const char *fname, int lines)
|
|
|
|
if (rv != 0)
|
|
{
|
|
+ rv = errno;
|
|
if (tempname)
|
|
unlink (tempname);
|
|
history_lines_written_to_file = 0;
|
|
@@ -767,6 +768,7 @@ mmap_error:
|
|
|
|
if (rv != 0)
|
|
{
|
|
+ rv = errno;
|
|
if (tempname)
|
|
unlink (tempname);
|
|
history_lines_written_to_file = 0;
|
|
diff --git a/patchlevel b/patchlevel
|
|
index ce3e355..626a945 100644
|
|
--- a/patchlevel
|
|
+++ b/patchlevel
|
|
@@ -1,3 +1,3 @@
|
|
# Do not edit -- exists only for use by patch
|
|
|
|
-3
|
|
+4
|
|
--
|
|
1.8.3.1
|
|
|