path: root/src/regex/glob.c
diff options
authorRich Felker <>2011-06-06 18:04:28 -0400
committerRich Felker <>2011-06-06 18:04:28 -0400
commitda88b16a221c9d327e1bfa61dd6f4f08dacce57a (patch)
tree64d07cc9ac0fc99dc6026d188f01943e81c055a4 /src/regex/glob.c
parent0dc99ac413d8bc054a2e95578475c7122455eee8 (diff)
fix handling of d_name in struct dirent
basically there are 3 choices for how to implement this variable-size string member: 1. C99 flexible array member: breaks using dirent.h with pre-C99 compiler. 2. old way: length-1 string: generates array bounds warnings in caller. 3. new way: length-NAME_MAX string. no problems, simplifies all code. of course the usable part in the pointer returned by readdir might be shorter than NAME_MAX+1 bytes, but that is allowed by the standard and doesn't hurt anything.
Diffstat (limited to 'src/regex/glob.c')
1 files changed, 2 insertions, 3 deletions
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)(
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))