ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feedback: show a more fitting message when opening a FIFO is interrupted

master
Benno Schulenberg 2019-05-26 14:17:35 +02:00
parent 5757aa8a0c
commit 308a094d8d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/files.c
View File

@ -957,9 +957,12 @@ int open_file(const char *filename, bool newfie, FILE **f)
restore_handler_for_Ctrl_C(); restore_handler_for_Ctrl_C();
#endif #endif
if (fd == -1) if (fd == -1) {
statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno)); if (errno == EINTR)
else { statusline(ALERT, _("Interrupted"));
else
statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno));
} else {
/* The file is A-OK. Associate a stream with it. */ /* The file is A-OK. Associate a stream with it. */
*f = fdopen(fd, "rb"); *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 we couldn't open the file, give up. */
if (fd == -1) { 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)); strerror(errno));
if (tempname != NULL) if (tempname != NULL)
unlink(tempname); unlink(tempname);