nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix readdir(3) not preserving errno in case of end-of-directory condition.

This commit is contained in:
Jonas 'Sortie' Termansen 2014-02-23 16:41:34 +01:00
parent 1e671aa8cd
commit 71f9f882d1
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libc/dirent/readdir.cpp
View File

@ -30,42 +30,30 @@
extern "C" struct dirent* readdir(DIR* dir)
{
int old_errno = errno;
if ( !dir->read_func )
{
dir->flags |= _DIR_ERROR;
errno = EBADF;
return NULL;
}
return dir->flags |= _DIR_ERROR, errno = EBADF, (struct dirent*) NULL;
size_t size = dir->entrysize;
int status = dir->read_func(dir->user, dir->entry, &size);
if ( status < 0 )
{
dir->flags |= _DIR_ERROR;
return NULL;
}
if ( 0 < status )
int status;
while ( 0 < (status = dir->read_func(dir->user, dir->entry, &size)) )
{
struct dirent* biggerdir = (struct dirent*) malloc(size);
if ( !biggerdir )
{
dir->flags |= _DIR_ERROR;
return NULL;
}
return dir->flags |= _DIR_ERROR, (struct dirent*) NULL;
free(dir->entry);
dir->entry = biggerdir;
dir->entrysize = size;
return readdir(dir);
}
if ( status < 0 )
return dir->flags |= _DIR_ERROR, (struct dirent*) NULL;
dir->flags &= ~_DIR_ERROR;
if ( !dir->entry->d_name[0] )
{
dir->flags |= _DIR_EOF;
return NULL;
}
return dir->flags |= _DIR_EOF, errno = old_errno, (struct dirent*) NULL;
return dir->entry;
}