[svn-commits] tilghman: trunk r163762 - in /trunk: ./ main/asterisk.c main/editline/read.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Dec 12 16:04:26 2008
New Revision: 163762

URL: http://svn.digium.com/view/asterisk?view=rev&rev=163762
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/main/asterisk.c
    trunk/main/editline/read.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=163762&r1=163761&r2=163762
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Fri Dec 12 16:04:26 2008
@@ -1943,6 +1943,8 @@
 		}
 		res = poll(fds, max, -1);
 		if (res < 0) {
+			if (sig_flags.need_quit)
+				break;
 			if (errno == EINTR)
 				continue;
 			ast_log(LOG_ERROR, "poll failed: %s\n", strerror(errno));

Modified: trunk/main/editline/read.c
URL: http://svn.digium.com/view/asterisk/trunk/main/editline/read.c?view=diff&rev=163762&r1=163761&r2=163762
==============================================================================
--- trunk/main/editline/read.c (original)
+++ trunk/main/editline/read.c Fri Dec 12 16:04:26 2008
@@ -286,6 +286,8 @@
 
 /* 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 @@
 #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);