diff options
| author | serg@serg.mysql.com <> | 2003-03-10 12:34:05 +0100 |
|---|---|---|
| committer | serg@serg.mysql.com <> | 2003-03-10 12:34:05 +0100 |
| commit | 7334a55249a2ae368cf5eb32597272b030896e48 (patch) | |
| tree | d5b0774330df218d949f082157743f79b4e49611 /mysys | |
| parent | c231b747e3d5bea9bf636528bf5491dd29ebab8e (diff) | |
| parent | 357766eca8c0724d4552f503683cf8adb923210b (diff) | |
| download | mariadb-git-7334a55249a2ae368cf5eb32597272b030896e48.tar.gz | |
Merge bk-internal:/home/bk/mysql-3.23/
into serg.mysql.com:/usr/home/serg/Abk/mysql
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/mysys/default.c b/mysys/default.c index 062711b185d..c9b0704216a 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -39,6 +39,7 @@ #include "mysys_priv.h" #include "m_string.h" #include "m_ctype.h" +#include <my_dir.h> char *defaults_extra_file=0; @@ -60,13 +61,13 @@ DATADIR, NullS, }; -#define default_ext ".cnf" /* extension for config file */ +#define default_ext ".cnf" /* extension for config file */ #ifdef __WIN__ #include <winbase.h> #define windows_ext ".ini" #endif -static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, +static my_bool search_default_file(DYNAMIC_ARRAY *args,MEM_ROOT *alloc, const char *dir, const char *config_file, const char *ext, TYPELIB *group); @@ -241,6 +242,16 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, { strmov(name,config_file); } + fn_format(name,name,"","",4); +#if !defined(__WIN__) && !defined(OS2) + { + MY_STAT stat_info; + if (!my_stat(name,&stat_info,MYF(MY_WME))) + return 0; + if (stat_info.st_mode & S_IWOTH) /* ignore world-writeable files */ + return 0; + } +#endif if (!(fp = my_fopen(fn_format(name,name,"","",4),O_RDONLY,MYF(0)))) return 0; /* Ignore wrong files */ |