[svn-commits] tilghman: branch 1.6.1 r163764 - in /branches/1.6.1: ./ main/ main/editline/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Dec 12 16:05:58 2008
New Revision: 163764

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

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

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/asterisk.c?view=diff&rev=163764&r1=163763&r2=163764
==============================================================================
--- branches/1.6.1/main/asterisk.c (original)
+++ branches/1.6.1/main/asterisk.c Fri Dec 12 16:05:58 2008
@@ -1931,6 +1931,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: branches/1.6.1/main/editline/read.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/main/editline/read.c?view=diff&rev=163764&r1=163763&r2=163764
==============================================================================
--- branches/1.6.1/main/editline/read.c (original)
+++ branches/1.6.1/main/editline/read.c Fri Dec 12 16:05:58 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);