diff options
| author | unknown <bar@mysql.com> | 2005-10-20 11:12:34 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-10-20 11:12:34 +0500 |
| commit | b488e98747ffb25a7efac1b4bff43049cffad9de (patch) | |
| tree | 2aa03882d1e2394198bacc0cbeb3bcb7ce8ba3aa /mysys/my_lib.c | |
| parent | 3d53c870d379e86cdfe3498cde843258fad52bb5 (diff) | |
| parent | f4911002726902f44cb7ebfa7487e0b84cf1b896 (diff) | |
| download | mariadb-git-b488e98747ffb25a7efac1b4bff43049cffad9de.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-5.0
mysys/charset.c:
Auto merged
Diffstat (limited to 'mysys/my_lib.c')
| -rw-r--r-- | mysys/my_lib.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/mysys/my_lib.c b/mysys/my_lib.c index c3b0b57e549..1908c70f407 100644 --- a/mysys/my_lib.c +++ b/mysys/my_lib.c @@ -427,6 +427,18 @@ MY_DIR *my_dir(const char *path, myf MyFlags) 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__ if (!(finfo.name= strdup_root(names_storage, find.ff_name))) goto error; #else @@ -442,11 +454,10 @@ MY_DIR *my_dir(const char *path, myf MyFlags) bzero(finfo.mystat, sizeof(MY_STAT)); #ifdef __BORLANDC__ finfo.mystat->st_size=find.ff_fsize; - mode=MY_S_IREAD; attrib=find.ff_attrib; #else finfo.mystat->st_size=find.size; - mode=MY_S_IREAD; attrib=find.attrib; #endif + mode=MY_S_IREAD; if (!(attrib & _A_RDONLY)) mode|=MY_S_IWRITE; if (attrib & _A_SUBDIR) |