summaryrefslogtreecommitdiff
path: root/src/dirent
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-06-06 18:04:28 -0400
committerRich Felker <dalias@aerifal.cx>2011-06-06 18:04:28 -0400
commitda88b16a221c9d327e1bfa61dd6f4f08dacce57a (patch)
tree64d07cc9ac0fc99dc6026d188f01943e81c055a4 /src/dirent
parent0dc99ac413d8bc054a2e95578475c7122455eee8 (diff)
downloadmusl-da88b16a221c9d327e1bfa61dd6f4f08dacce57a.tar.gz
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/dirent')
-rw-r--r--src/dirent/scandir.c7
1 files changed, 3 insertions, 4 deletions
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);