summaryrefslogtreecommitdiff
path: root/mysys/my_fopen.c
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-05-25 12:56:47 +0300
committerunknown <monty@mysql.com>2005-05-25 12:56:47 +0300
commit549f56dc3d7fdae2cf7d8ebfbc8a118bf21f12a0 (patch)
tree52be2414a34bc47a37198260633286ca16187fec /mysys/my_fopen.c
parentb36f9f2eeded87ee629619f0c35840f3bec10013 (diff)
downloadmariadb-git-549f56dc3d7fdae2cf7d8ebfbc8a118bf21f12a0.tar.gz
Cleanup during code review
Faster detection of wrong table names (like PRN) on windows include/my_sys.h: Added check_if_legal_filename() mysys/my_access.c: Added check_if_legal_filename() Set errno if my_access() fails mysys/my_fopen.c: USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows mysys/my_open.c: USe check_if_legal_filename() instead of my_access() to detect wrong file names on windows sql/sql_lex.cc: Portability fix sql/sql_parse.cc: Simple cleanup sql/sql_repl.cc: Cleanup during code review
Diffstat (limited to 'mysys/my_fopen.c')
-rw-r--r--mysys/my_fopen.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c
index 4310250bd0d..3c6f1b15384 100644
--- a/mysys/my_fopen.c
+++ b/mysys/my_fopen.c
@@ -39,13 +39,16 @@ FILE *my_fopen(const char *FileName, int Flags, myf MyFlags)
very well
*/
#ifdef __WIN__
- if (! (Flags & O_CREAT) && my_access(FileName, F_OK))
- fd=0;
+ if (check_if_legal_filename(FileName))
+ {
+ errno= EACCES;
+ fd= 0;
+ }
else
#endif
{
- make_ftype(type,Flags);
- fd = fopen(FileName, type);
+ make_ftype(type,Flags);
+ fd = fopen(FileName, type);
}
if (fd != 0)