From 308a094d8d08135ea7b2a209b06ce9e19ab3b14d Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sun, 26 May 2019 14:17:35 +0200 Subject: [PATCH] feedback: show a more fitting message when opening a FIFO is interrupted --- src/files.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/files.c b/src/files.c index 36dfff83..172d9193 100644 --- a/src/files.c +++ b/src/files.c @@ -957,9 +957,12 @@ int open_file(const char *filename, bool newfie, FILE **f) restore_handler_for_Ctrl_C(); #endif - if (fd == -1) - statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno)); - else { + if (fd == -1) { + if (errno == EINTR) + statusline(ALERT, _("Interrupted")); + else + statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno)); + } else { /* The file is A-OK. Associate a stream with it. */ *f = fdopen(fd, "rb"); @@ -1828,7 +1831,10 @@ bool write_file(const char *name, FILE *f_open, bool tmp, /* If we couldn't open the file, give up. */ if (fd == -1) { - statusline(ALERT, _("Error writing %s: %s"), realname, + if (errno == EINTR) + statusline(ALERT, _("Interrupted")); + else + statusline(ALERT, _("Error writing %s: %s"), realname, strerror(errno)); if (tempname != NULL) unlink(tempname);