diff options
author | unknown <reggie@mdk10.(none)> | 2005-06-22 18:51:48 -0500 |
---|---|---|
committer | unknown <reggie@mdk10.(none)> | 2005-06-22 18:51:48 -0500 |
commit | 9095cb4a738e83fccc1df6d3c610784fcbc5c336 (patch) | |
tree | 02696d472a9ccb27d903d20347b80836dc2c6147 | |
parent | 35a4e43766368bf7c72a7a81448f1ef670bba5cb (diff) | |
parent | 466c032ec1b260947db1597893205503e9b4907a (diff) | |
download | mariadb-git-9095cb4a738e83fccc1df6d3c610784fcbc5c336.tar.gz |
Merge mdk10.(none):/home/reggie/bk/bug9148clone-5.0.8-build
into mdk10.(none):/home/reggie/bk/mysql-5.0-base
mysys/my_access.c:
Auto merged
-rw-r--r-- | mysys/my_access.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mysys/my_access.c b/mysys/my_access.c index 28210bdfc7d..c01031827c0 100644 --- a/mysys/my_access.c +++ b/mysys/my_access.c @@ -93,18 +93,20 @@ int check_if_legal_filename(const char *path) path+= dirname_length(path); /* To start of filename */ if (!(end= strchr(path, FN_EXTCHAR))) end= strend(path); - if (path == end || (uint) (path - end) > MAX_RESERVED_NAME_LENGTH) + if (path == end || (uint) (end - path) > MAX_RESERVED_NAME_LENGTH) DBUG_RETURN(0); /* Simplify inner loop */ for (reserved_name= reserved_names; *reserved_name; reserved_name++) { const char *name= path; - while (name != end) + const char *current_reserved_name= *reserved_name; + + while (name != end && *current_reserved_name) { - if (my_toupper(&my_charset_latin1, *path) != - my_toupper(&my_charset_latin1, *name)) + if (*current_reserved_name != my_toupper(&my_charset_latin1, *name)) break; - if (name++ == end) + current_reserved_name++; + if (++name == end) DBUG_RETURN(1); /* Found wrong path */ } } |