PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

Match dup2 and fcntl error values to POSIX. 

* dtable.h (OPEN_MAX_MAX): New macro.
* resource.cc (getrlimit) [RLIMIT_NOFILE]: Use it.
* dtable.cc (dtable::extend): Likewise.
* fcntl.cc (fcntl64): Obey POSIX rule with too-large F_DUPFD.
* syscalls.cc (dup2): Likewise.
This commit is contained in:
Eric Blake 2009-09-22 04:09:03 +00:00
parent a7b24e14d7
commit 29bca9bb0c
6 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2009-09-22 Eric Blake <ebb9@byu.net>
* dtable.h (OPEN_MAX_MAX): New macro.
* resource.cc (getrlimit) [RLIMIT_NOFILE]: Use it.
* dtable.cc (dtable::extend): Likewise.
* fcntl.cc (fcntl64): Obey POSIX rule with too-large F_DUPFD.
* syscalls.cc (dup2): Likewise.
2009-09-21 Corinna Vinschen <corinna@vinschen.de>
* cygheap.h (cwdstuff::get_posix): Convert to const inline method just

2
winsup/cygwin/dtable.cc
View File

@ -80,7 +80,7 @@ dtable::extend (int howmuch)
if (howmuch <= 0)
return 0;
if (new_size > (100 * NOFILE_INCR))
if (new_size > OPEN_MAX_MAX)
{
set_errno (EMFILE);
return 0;

5
winsup/cygwin/dtable.h
View File

@ -1,6 +1,7 @@
/* dtable.h: fd table definition.
Copyright 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 Red Hat, Inc.
Copyright 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Red
Hat, Inc.
This file is part of Cygwin.
@ -10,6 +11,8 @@ details. */
/* Initial and increment values for cygwin's fd table */
#define NOFILE_INCR 32
/* Maximum size we allow expanding to. */
#define OPEN_MAX_MAX (100 * NOFILE_INCR)
#include "thread.h"
#include "sync.h"

5
winsup/cygwin/fcntl.cc
View File

@ -1,6 +1,7 @@
/* fcntl.cc: fcntl syscall
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2008 Red Hat, Inc.
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2008,
2009 Red Hat, Inc.
This file is part of Cygwin.
@ -40,7 +41,7 @@ fcntl64 (int fd, int cmd, ...)
switch (cmd)
{
case F_DUPFD:
if ((int) arg >= 0)
if ((int) arg >= 0 && (int) arg < OPEN_MAX_MAX)
res = dup2 (fd, cygheap_fdnew (((int) arg) - 1));
else
{

2
winsup/cygwin/resource.cc
View File

@ -143,7 +143,7 @@ getrlimit (int resource, struct rlimit *rlp)
rlp->rlim_cur = getdtablesize ();
if (rlp->rlim_cur < OPEN_MAX)
rlp->rlim_cur = OPEN_MAX;
rlp->rlim_max = 100 * NOFILE_INCR;
rlp->rlim_max = OPEN_MAX_MAX;
break;
case RLIMIT_CORE:
rlp->rlim_cur = rlim_core;

6
winsup/cygwin/syscalls.cc
View File

@ -124,6 +124,12 @@ dup (int fd)
int
dup2 (int oldfd, int newfd)
{
if (newfd >= OPEN_MAX_MAX)
{
syscall_printf ("-1 = dup2 (%d, %d) (%d too large)", oldfd, newfd, newfd);
set_errno (EBADF);
return -1;
}
return cygheap->fdtab.dup2 (oldfd, newfd);
}