* resource.cc (setrlimit): Use consistent commenting style. Return EINVAL when
rlim_cur > rlim_max.
This commit is contained in:
parent
1f36328e7f
commit
0cfce9acc9
@ -1,3 +1,8 @@
|
|||||||
|
2013-05-01 Christopher Faylor <me.cygwin2013@cgf.cx>
|
||||||
|
|
||||||
|
* resource.cc (setrlimit): Use consistent commenting style. Return
|
||||||
|
EINVAL when rlim_cur > rlim_max.
|
||||||
|
|
||||||
2013-04-30 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
|
2013-04-30 Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
|
||||||
|
|
||||||
Throughout, (mainly in fhandler*) fix remaining gcc 4.7 mismatch
|
Throughout, (mainly in fhandler*) fix remaining gcc 4.7 mismatch
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
/* resource.cc: getrusage () and friends.
|
/* resource.cc: getrusage () and friends.
|
||||||
|
|
||||||
Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2008, 2009, 2010,
|
Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2008, 2009, 2010,
|
||||||
2011, 2012 Red Hat, Inc.
|
2011, 2012, 2013 Red Hat, Inc.
|
||||||
|
|
||||||
Written by Steve Chamberlain (sac@cygnus.com), Doug Evans (dje@cygnus.com),
|
Written by Steve Chamberlain (sac@cygnus.com), Doug Evans (dje@cygnus.com),
|
||||||
Geoffrey Noer (noer@cygnus.com) of Cygnus Support.
|
Geoffrey Noer (noer@cygnus.com) of Cygnus Support.
|
||||||
@ -167,17 +167,22 @@ setrlimit (int resource, const struct rlimit *rlp)
|
|||||||
|
|
||||||
struct rlimit oldlimits;
|
struct rlimit oldlimits;
|
||||||
|
|
||||||
// Check if the request is to actually change the resource settings.
|
/* Check if the request is to actually change the resource settings.
|
||||||
// If it does not result in a change, take no action and do not
|
If it does not result in a change, take no action and do not fail. */
|
||||||
// fail.
|
|
||||||
if (getrlimit (resource, &oldlimits) < 0)
|
if (getrlimit (resource, &oldlimits) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (oldlimits.rlim_cur == rlp->rlim_cur &&
|
if (oldlimits.rlim_cur == rlp->rlim_cur &&
|
||||||
oldlimits.rlim_max == rlp->rlim_max)
|
oldlimits.rlim_max == rlp->rlim_max)
|
||||||
// No change in resource requirements, succeed immediately
|
/* No change in resource requirements, succeed immediately */
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
if (rlp->rlim_cur > rlp->rlim_max)
|
||||||
|
{
|
||||||
|
set_errno (EINVAL);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
switch (resource)
|
switch (resource)
|
||||||
{
|
{
|
||||||
case RLIMIT_CORE:
|
case RLIMIT_CORE:
|
||||||
|
Loading…
Reference in New Issue
Block a user