1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/alexi/mysql-4.1

Browse Source 
into  mysql.com:/home/alexi/dev/mysql-4.1-4375
This commit is contained in:
unknown 2005-10-19 21:07:08 +04:00
commit 28421fe8ed
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mysys/my_lib.c
View File

@ -426,6 +426,18 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
do do
{ {
#ifdef __BORLANDC__
attrib= find.ff_attrib;
#else
attrib= find.attrib;
/*
Do not show hidden and system files which Windows sometimes create.
Note. Because Borland's findfirst() is called with the third
argument = 0 hidden/system files are excluded from the search.
*/
if (attrib & (_A_HIDDEN | _A_SYSTEM))
continue;
#endif
#ifdef __BORLANDC__ #ifdef __BORLANDC__
if (!(finfo.name= strdup_root(names_storage, find.ff_name))) if (!(finfo.name= strdup_root(names_storage, find.ff_name)))
goto error; goto error;
@ -442,11 +454,10 @@ MY_DIR *my_dir(const char *path, myf MyFlags)
bzero(finfo.mystat, sizeof(MY_STAT)); bzero(finfo.mystat, sizeof(MY_STAT));
#ifdef __BORLANDC__ #ifdef __BORLANDC__
finfo.mystat->st_size=find.ff_fsize; finfo.mystat->st_size=find.ff_fsize;
mode=MY_S_IREAD; attrib=find.ff_attrib;
#else #else
finfo.mystat->st_size=find.size; finfo.mystat->st_size=find.size;
mode=MY_S_IREAD; attrib=find.attrib;
#endif #endif
mode=MY_S_IREAD;
if (!(attrib & _A_RDONLY)) if (!(attrib & _A_RDONLY))
mode|=MY_S_IWRITE; mode|=MY_S_IWRITE;
if (attrib & _A_SUBDIR) if (attrib & _A_SUBDIR)