diff options
| -rw-r--r-- | include/dirent.h | 2 | ||||
| -rw-r--r-- | src/dirent/scandir.c | 7 | ||||
| -rw-r--r-- | src/regex/glob.c | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/include/dirent.h b/include/dirent.h index ca000bd9..7b70abd4 100644 --- a/include/dirent.h +++ b/include/dirent.h @@ -18,7 +18,7 @@ struct dirent off_t d_off; unsigned short d_reclen; unsigned char d_type; - char d_name[1]; + char d_name[256]; }; #define d_fileno d_ino diff --git a/src/dirent/scandir.c b/src/dirent/scandir.c index aad813ac..a85cfac1 100644 --- a/src/dirent/scandir.c +++ b/src/dirent/scandir.c @@ -12,7 +12,7 @@ int scandir(const char *path, struct dirent ***res, { DIR *d = opendir(path); struct dirent *de, **names=0, **tmp; - size_t cnt=0, len=0, size; + size_t cnt=0, len=0; int old_errno = errno; if (!d) return -1; @@ -26,10 +26,9 @@ int scandir(const char *path, struct dirent ***res, if (!tmp) break; names = tmp; } - size = offsetof(struct dirent,d_name) + strlen(de->d_name) + 1; - names[cnt] = malloc(size); + names[cnt] = malloc(de->d_reclen); if (!names[cnt]) break; - memcpy(names[cnt++], de, size); + memcpy(names[cnt++], de, de->d_reclen); } closedir(d); diff --git a/src/regex/glob.c b/src/regex/glob.c index 67f84bcf..550f655c 100644 --- a/src/regex/glob.c +++ b/src/regex/glob.c @@ -53,8 +53,7 @@ static int append(struct match **tail, const char *name, size_t len, int mark) 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); @@ -94,7 +93,7 @@ static int match_in_dir(const char *d, const char *p, int flags, int (*errfunc)( 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; |