Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 05:28:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix comments on #516. Split reader_interrupted into a reader_interrupted and a reader_reading_interrupted

Browse source
This commit is contained in:
Jan Kanis 2013-01-22 11:00:02 +01:00
parent c58278758c
commit eb1c00c56b
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
input.cpp
View file

@ -292,7 +292,7 @@ static int interrupt_handler()
/*
Tell the reader an event occured
*/
if (reader_interrupted())
if (reader_reading_interrupted())
{
/*
Return 3, i.e. the character read by a Control-C.

8
reader.cpp
View file

@ -657,11 +657,17 @@ void reader_reset_interrupted()
int reader_interrupted()
{
int res=interrupted;
int res = interrupted;
if (res)
{
interrupted=0;
}
return res;
}
int reader_reading_interrupted()
{
int res = reader_interrupted();
if (res && data && data->interruptible)
{
reader_exit(1, 0);

8
reader.h
View file

@ -111,6 +111,12 @@ void reader_set_buffer(const wcstring &b, size_t p);
*/
size_t reader_get_cursor_pos();
/**
Return the value of the interrupted flag, which is set by the sigint
handler, and clear it if it was set.
*/
int reader_interrupted();
/**
Clear the interrupted flag unconditionally without handling anything. The
flag could have been set e.g. when an interrupt arrived just as we were
@ -124,7 +130,7 @@ void reader_reset_interrupted();
handler, and clear it if it was set. If the current reader is interruptible,
call \c reader_exit().
*/
int reader_interrupted();
int reader_reading_interrupted();
/**
Read one line of input. Before calling this function, reader_push()