JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cygheap.h (cygheap_fdnew): Avoid setting errno directly since it will have

Browse Source 
been set by a previous function.
* dtable.h (dtable::extend): Accept second size_t argument.
* dtable.cc (dtable::extend): Accept second "min" argument which allows
checking for OPEN_MAX_MAX boundary conditions.
(dtable_init): Accommodate second argument to dtable::extend.
(dtable::find_unused_handle): Ditto.
* syscalls.cc (setdtablesize): Ditto.
(dup): Return any error passed by cygheap_fdnew() directly.
(getdtablesize): Just return dtable size directly.
This commit is contained in:
Christopher Faylor
2013-12-05 19:43:34 +00:00
parent 2f8a6f1947
commit 09244c002e
5 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
winsup/cygwin/dtable.cc
View File

@@ -58,7 +58,7 @@ void
dtable_init ()
{
if (!cygheap->fdtab.size)
cygheap->fdtab.extend (NOFILE_INCR);
cygheap->fdtab.extend (NOFILE_INCR, 0);
}
void __stdcall
@@ -72,12 +72,16 @@ set_std_handle (int fd)
}
int
dtable::extend (size_t howmuch)
dtable::extend (size_t howmuch, size_t min)
{
size_t new_size = size + howmuch;
fhandler_base **newfds;
if (new_size > OPEN_MAX_MAX)
if (new_size <= OPEN_MAX_MAX)
/* ok */;
else if (size < OPEN_MAX_MAX && min < OPEN_MAX_MAX)
new_size = OPEN_MAX_MAX;
else
{
set_errno (EMFILE);
return 0;
@@ -223,7 +227,7 @@ dtable::delete_archetype (fhandler_base *fh)
int
dtable::find_unused_handle (size_t start)
{
/* When extending, always make sure that there is a NOFILE_INCR chunk
/* When extending, try to allocate a NOFILE_INCR chunk
following the empty fd. */
size_t extendby = NOFILE_INCR + ((start >= size) ? 1 + start - size : 0);
@@ -238,7 +242,7 @@ dtable::find_unused_handle (size_t start)
goto out;
}
}
while (extend (extendby));
while (extend (extendby, start));
out:
return res;
}