kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 180195 via svnmerge from

Browse Source 
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)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@180197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-03-04 19:27:00 +00:00
parent c9ff6a79ac
commit eabccc0ba8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/callerid.c
View File

@@ -1008,7 +1008,7 @@ int ast_callerid_parse(char *instr, char **name, char **location)
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, '"'))) {