diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-12 22:05:16 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-12 22:05:16 +0000 |
commit | 15da66e40e2068128f827fc7fcfe8ea544a663bf (patch) | |
tree | 0981f37791b1f99d18291acd0c72844ccab041d9 /main/editline/read.c | |
parent | 8f8dea1657a97c0b8d84caa01b1f10ab2b1e501b (diff) |
Merged revisions 163762 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r163762 | tilghman | 2008-12-12 16:04:26 -0600 (Fri, 12 Dec 2008) | 14 lines
Merged revisions 163761 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r163761 | tilghman | 2008-12-12 16:03:10 -0600 (Fri, 12 Dec 2008) | 7 lines
Simple fix for Ctrl-C not immediately exiting Asterisk, but also add a
pointer inside editline to look back to asterisk.c, so others don't spend
as much time as I did looking (in the wrong place) for the appropriate
function.
Reported by: ZX81, via the #asterisk-users channel
Fixed by: me (license 14)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@163763 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/editline/read.c')
-rw-r--r-- | main/editline/read.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/editline/read.c b/main/editline/read.c index ccd0a06e5..80d51da4a 100644 --- a/main/editline/read.c +++ b/main/editline/read.c @@ -286,6 +286,8 @@ read_getcmd(EditLine *el, el_action_t *cmdnum, char *ch) /* read_char(): * Read a character from the tty. + * XXX This routine is the default, but what you are actually looking for + * is in main/asterisk.c, in ast_el_read_char(). XXX */ private int read_char(EditLine *el, char *cp) @@ -344,6 +346,7 @@ el_getc(EditLine *el, char *cp) #ifdef DEBUG_READ (void) fprintf(el->el_errfile, "Reading a character\n"); #endif /* DEBUG_READ */ + /* See main/asterisk.c: ast_el_read_char() */ num_read = (*el->el_read.read_char)(el, cp); #ifdef DEBUG_READ (void) fprintf(el->el_errfile, "Got it %c\n", *cp); |