static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)(const char *path, int err), struct match **tail)
{
DIR *dir;
- long long de_buf[(sizeof(struct dirent) + NAME_MAX + sizeof(long long))/sizeof(long long)];
- struct dirent *de;
+ struct dirent de_buf, *de;
char pat[strlen(p)+1];
char *p2;
size_t l = strlen(d);
int literal;
- int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0) | FNM_PERIOD;
+ int fnm_flags= ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
+ | ((!(flags & GLOB_PERIOD)) ? FNM_PERIOD : 0);
int error;
if ((p2 = strchr(p, '/'))) {
closedir(dir);
return error;
}
- while (!(error = readdir_r(dir, (void *)de_buf, &de)) && de) {
+ while (!(error = readdir_r(dir, &de_buf, &de)) && de) {
char namebuf[l+de->d_reclen+2], *name = namebuf;
if (!literal && fnmatch(p, de->d_name, fnm_flags))
continue;
} else {
int mark = 0;
if (flags & GLOB_MARK) {
- if (de->d_type)
+ if (de->d_type && !S_ISLNK(de->d_type<<12))
mark = S_ISDIR(de->d_type<<12);
else {
struct stat st;