Merge "res_ael: Fix pattern matching against literal '+'"
This commit is contained in:
commit
dd06912dfa
|
@ -759,10 +759,10 @@ static int extension_matches(pval *here, const char *exten, const char *pattern)
|
|||
*r++ = '.';
|
||||
*r++ = '*';
|
||||
break;
|
||||
case '*':
|
||||
case '*': /* regex metacharacter */
|
||||
case '+': /* regex metacharacter */
|
||||
*r++ = '\\';
|
||||
*r++ = '*';
|
||||
break;
|
||||
/* fall through */
|
||||
default:
|
||||
*r++ = *p;
|
||||
break;
|
||||
|
@ -792,14 +792,9 @@ static int extension_matches(pval *here, const char *exten, const char *pattern)
|
|||
exten, pattern); */
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
if ( strcmp(exten,pattern) == 0 ) {
|
||||
return 1;
|
||||
} else
|
||||
return 0;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue