Fix MatchCaseInsensitive[List]](): lowercase string _and_ pattern

[ngircd-alex.git] / src / ngircd / match.c

diff --git a/src/ngircd/match.c b/src/ngircd/match.c
index 93ddc0bc71f363ebece6d8bac0719edab478dcbf..c1119a50d9edd917840a85b94a29e95ed0f98ce7 100644 (file)
--- a/src/ngircd/match.c
+++ b/src/ngircd/match.c
@@ -50,8 +50,10 @@ static int Matche_After_Star PARAMS(( const char *p, const char *t ));
 GLOBAL bool
 Match( const char *Pattern, const char *String )
 {
 GLOBAL bool
 Match( const char *Pattern, const char *String )
 {

-       if( Matche( Pattern, String ) == MATCH_VALID ) return true;
-       else return false;
+       if (Matche(Pattern, String) == MATCH_VALID)
+               return true;
+       else
+               return false;

 } /* Match */
 
 /**
 } /* Match */
 
 /**


@@ -64,10 +66,12 @@ Match( const char *Pattern, const char *String )
 GLOBAL bool
 MatchCaseInsensitive(const char *Pattern, const char *String)
 {
 GLOBAL bool
 MatchCaseInsensitive(const char *Pattern, const char *String)
 {

-       char haystack[COMMAND_LEN];
+       char needle[COMMAND_LEN], haystack[COMMAND_LEN];

 
 

+       strlcpy(needle, Pattern, sizeof(needle));

        strlcpy(haystack, String, sizeof(haystack));
        strlcpy(haystack, String, sizeof(haystack));

-       return Match(Pattern, ngt_LowerStr(haystack));
+
+       return Match(ngt_LowerStr(needle), ngt_LowerStr(haystack));

 } /* MatchCaseInsensitive */
 
 /**
 } /* MatchCaseInsensitive */
 
 /**


@@ -82,16 +86,14 @@ GLOBAL bool
 MatchCaseInsensitiveList(const char *Pattern, const char *String,
                     const char *Separator)
 {
 MatchCaseInsensitiveList(const char *Pattern, const char *String,
                     const char *Separator)
 {

-       char tmp_pattern[COMMAND_LEN], haystack[COMMAND_LEN], *ptr;
+       char tmp_pattern[COMMAND_LEN], *ptr;

 
        strlcpy(tmp_pattern, Pattern, sizeof(tmp_pattern));
 
        strlcpy(tmp_pattern, Pattern, sizeof(tmp_pattern));

-       strlcpy(haystack, String, sizeof(haystack));
-       ngt_LowerStr(haystack);

 
        ptr = strtok(tmp_pattern, Separator);
        while (ptr) {
                ngt_TrimStr(ptr);
 
        ptr = strtok(tmp_pattern, Separator);
        while (ptr) {
                ngt_TrimStr(ptr);

-               if (Match(ptr, haystack))
+               if (MatchCaseInsensitive(ptr, String))

                        return true;
                ptr = strtok(NULL, Separator);
        }
                        return true;
                ptr = strtok(NULL, Separator);
        }