[svn-commits] file: branch 1.6.0 r180196 - in /branches/1.6.0: ./ main/callerid.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Mar  4 13:25:59 2009
New Revision: 180196

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180196
Log:
Merged revisions 180195 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r180195 | file | 2009-03-04 15:24:59 -0400 (Wed, 04 Mar 2009) | 11 lines
  
  Merged revisions 180194 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r180194 | file | 2009-03-04 15:22:50 -0400 (Wed, 04 Mar 2009) | 4 lines
    
    Look for the number in a callerid string starting from the end. This way a value using <> can exist in the name portion.
    
    (issue #AST-194)
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/callerid.c

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

Modified: branches/1.6.0/main/callerid.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/callerid.c?view=diff&rev=180196&r1=180195&r2=180196
==============================================================================
--- branches/1.6.0/main/callerid.c (original)
+++ branches/1.6.0/main/callerid.c Wed Mar  4 13:25:59 2009
@@ -983,7 +983,7 @@
 	char *ns, *ne, *ls, *le;
 
 	/* Try "name" <location> format or name <location> format */
-	if ((ls = strchr(instr, '<')) && (le = strchr(ls, '>'))) {
+	if ((ls = strrchr(instr, '<')) && (le = strrchr(ls, '>'))) {
 		*ls = *le = '\0';	/* location found, trim off the brackets */
 		*location = ls + 1;	/* and this is the result */
 		if ((ns = strchr(instr, '"')) && (ne = strchr(ns + 1, '"'))) {