summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
0dc99ac)
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.
off_t d_off;
unsigned short d_reclen;
unsigned char d_type;
off_t d_off;
unsigned short d_reclen;
unsigned char d_type;
};
#define d_fileno d_ino
};
#define d_fileno d_ino
{
DIR *d = opendir(path);
struct dirent *de, **names=0, **tmp;
{
DIR *d = opendir(path);
struct dirent *de, **names=0, **tmp;
- size_t cnt=0, len=0, size;
int old_errno = errno;
if (!d) return -1;
int old_errno = errno;
if (!d) return -1;
if (!tmp) break;
names = tmp;
}
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);
- memcpy(names[cnt++], de, size);
+ memcpy(names[cnt++], de, de->d_reclen);
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;
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);
char pat[strlen(p)+1];
char *p2;
size_t l = strlen(d);
closedir(dir);
return error;
}
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;
char namebuf[l+de->d_reclen+2], *name = namebuf;
if (!literal && fnmatch(p, de->d_name, fnm_flags))
continue;