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

* cygheap.cc (creturn): Set appropriate errno when out of memory.

Browse Source 
(ccalloc): Only issue system_printf when debugging.
* dtable.cc (dtable::extend): Only allocate 100 * the incremental growth size
max.  Set errno appropriately.
(dtable::build_fhandler): Check for error from set_name.
* fhandler.cc (fhandler_base::set_name): Set errno and return error on OOM.
* fhandler.h (fhandler_base::set_name): Change to bool.
* fhandler_process.cc (format_process_stat): Fix formatting.
* resource.cc (getrlimit): Return greater of OPEN_MAX or fd table size.
* sysconf.cc (sysconf): Ditto.
This commit is contained in:
Christopher Faylor
2003-07-09 01:33:06 +00:00
parent a42408549f
commit 4d782b426a
8 changed files with 64 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
winsup/cygwin/dtable.cc
View File

@@ -65,18 +65,25 @@ dtable::extend (int howmuch)
if (howmuch <= 0)
return 0;
if (new_size > (100 * NOFILE_INCR))
{
set_errno (EMFILE);
return 0;
}
/* Try to allocate more space for fd table. We can't call realloc ()
here to preserve old table if memory allocation fails */
if (!(newfds = (fhandler_base **) ccalloc (HEAP_ARGV, new_size, sizeof newfds[0])))
{
debug_printf ("calloc failed");
set_errno (ENOMEM);
return 0;
}
if (fds)
{
memcpy (newfds, fds, size * sizeof (fds[0]));
cfree (fds);
memcpy (newfds, fds, size * sizeof (fds[0]));
}
size = new_size;
@@ -404,7 +411,8 @@ dtable::build_fhandler (int fd, DWORD dev, char *unix_name,
for (p = (char *) win32_name; (p = strchr (p, '/')); p++)
*p = '\\';
}
fh->set_name (unix_name, win32_name, fh->get_unit ());
if (!fh->set_name (unix_name, win32_name, fh->get_unit ()))
return NULL;
}
debug_printf ("fd %d, fh %p", fd, fh);
return fd >= 0 ? (fds[fd] = fh) : fh;