X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?p=ossec-hids.git;a=blobdiff_plain;f=src%2Fos_regex%2Fos_match_execute.c;h=8977484cb33edfa786370e7504797c2f2b7622ec;hp=d61f0cb1b03b00ed3a4e5388ec3aeee4b5ab7194;hb=6ef2f786c6c8ead94841b5f93baf9f43421f08c8;hpb=301048b51990573e58a30dc4a5bb4ec285cad554 diff --git a/src/os_regex/os_match_execute.c b/src/os_regex/os_match_execute.c index d61f0cb..8977484 100755 --- a/src/os_regex/os_match_execute.c +++ b/src/os_regex/os_match_execute.c @@ -39,10 +39,10 @@ int _OS_Match(char *pattern, char *str, int str_len, int size) { if(str[j] == '\0') return(FALSE); - + else if(*pt != charmap[(uchar)str[j]]) { - pt = pattern; + pt = pattern; goto nnext; } j++;pt++; @@ -62,8 +62,8 @@ int _os_strncmp(char *pattern, char *str, int str_len, int size) { if(strncasecmp(pattern, str, size) == 0) return(TRUE); - - return(FALSE); + + return(FALSE); } /** Internal matching **/ @@ -71,8 +71,8 @@ int _os_strcmp(char *pattern, char *str, int str_len, int size) { if(strcasecmp(pattern, str) == 0) return(TRUE); - - return(FALSE); + + return(FALSE); } int _os_strmatch(char *pattern, char *str, int str_len, int size) @@ -96,11 +96,11 @@ int _os_strcmp_last(char *pattern, char *str, int str_len, int size) /* Size of the string must be bigger */ if((str_len - size) < 0) return(FALSE); - + if(strcasecmp(pattern, str + (str_len - size)) == 0) return(TRUE); - - return(FALSE); + + return(FALSE); } @@ -113,7 +113,7 @@ int _os_strcmp_last(char *pattern, char *str, int str_len, int size) int OSMatch_Execute(char *str, int str_len, OSMatch *reg) { short int i = 0; - + /* The string can't be NULL */ if(str == NULL) { @@ -125,9 +125,9 @@ int OSMatch_Execute(char *str, int str_len, OSMatch *reg) /* Looping on all sub patterns */ while(reg->patterns[i]) { - if(reg->match_fp[i](reg->patterns[i], - str, - str_len, + if(reg->match_fp[i](reg->patterns[i], + str, + str_len, reg->size[i]) == TRUE) { return(1); @@ -136,7 +136,7 @@ int OSMatch_Execute(char *str, int str_len, OSMatch *reg) } return(0); -} +} /* EOF */