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

12
winsup/cygwin/syscalls.cc
View File

@@ -120,7 +120,12 @@ close_all_files (bool norelease)
extern "C" int
dup (int fd)
{
int res = cygheap->fdtab.dup3 (fd, cygheap_fdnew (), 0);
int res;
int newfd = cygheap_fdnew ();
if (newfd < 0)
res = -1;
else
res = cygheap->fdtab.dup3 (fd, newfd, 0);
syscall_printf ("%R = dup(%d)", res, fd);
return res;
}
@@ -2611,7 +2616,8 @@ setdtablesize (int size)
return -1;
}
if (size <= (int)cygheap->fdtab.size || cygheap->fdtab.extend (size - cygheap->fdtab.size))
if (size <= (int) cygheap->fdtab.size
|| cygheap->fdtab.extend (size - cygheap->fdtab.size, OPEN_MAX_MAX))
return 0;
return -1;
@@ -2620,7 +2626,7 @@ setdtablesize (int size)
extern "C" int
getdtablesize ()
{
return cygheap->fdtab.size > OPEN_MAX ? cygheap->fdtab.size : OPEN_MAX;
return cygheap->fdtab.size;
}
extern "C" int