mirrors/nano
1
0
Fork 0
mirror of git://git.sv.gnu.org/nano.git synced 2025-01-25 18:52:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

files: allow to interrupt the opening of a FIFO with Ctrl+C

Browse Source 
With-help-from: Brand Huntsman <alpha@qzx.com>
This commit is contained in:
Benno Schulenberg 2019-05-24 10:39:33 +02:00
parent e3e81879b1
commit 4cacb626a0
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/files.c
View File

@ -889,6 +889,10 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
#endif #endif
} }
/* An empty handler for a keyboard interrupt (SIGINT). */
RETSIGTYPE noop(int signal)
{}
/* Open the file with the given name. If the file does not exist, display /* Open the file with the given name. If the file does not exist, display
* "New File" if newfie is TRUE, and say "File not found" otherwise. * "New File" if newfie is TRUE, and say "File not found" otherwise.
* Return -2 if we say "New File", -1 if the file isn't opened, and the * Return -2 if we say "New File", -1 if the file isn't opened, and the
@ -896,6 +900,7 @@ void read_file(FILE *f, int fd, const char *filename, bool undoable)
int open_file(const char *filename, bool newfie, bool quiet, FILE **f) int open_file(const char *filename, bool newfie, bool quiet, FILE **f)
{ {
struct stat fileinfo, fileinfo2; struct stat fileinfo, fileinfo2;
struct sigaction oldaction, newaction;
int fd; int fd;
char *full_filename = get_full_path(filename); char *full_filename = get_full_path(filename);
@ -931,9 +936,21 @@ int open_file(const char *filename, bool newfie, bool quiet, FILE **f)
if (S_ISFIFO(fileinfo.st_mode)) if (S_ISFIFO(fileinfo.st_mode))
statusbar(_("Reading from FIFO...")); statusbar(_("Reading from FIFO..."));
#ifndef NANO_TINY
newaction.sa_handler = noop;
newaction.sa_flags = 0;
sigaction(SIGINT, &newaction, &oldaction);
enable_signals();
#endif
/* Try opening the file. */ /* Try opening the file. */
fd = open(full_filename, O_RDONLY); fd = open(full_filename, O_RDONLY);
#ifndef NANO_TINY
disable_signals();
sigaction(SIGINT, &oldaction, NULL);
#endif
if (fd == -1) if (fd == -1)
statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno)); statusline(ALERT, _("Error reading %s: %s"), filename, strerror(errno));
else { else {

1
src/proto.h
View File

@ -425,6 +425,7 @@ void block_sigwinch(bool blockit);
RETSIGTYPE handle_sigwinch(int signal); RETSIGTYPE handle_sigwinch(int signal);
void regenerate_screen(void); void regenerate_screen(void);
void do_toggle(int flag); void do_toggle(int flag);
void disable_signals(void);
void enable_signals(void); void enable_signals(void);
#endif #endif
void disable_flow_control(void); void disable_flow_control(void);