diff options
| author | Jari Aalto <jari.aalto@cante.net> | 2001-04-06 19:14:31 +0000 |
|---|---|---|
| committer | Jari Aalto <jari.aalto@cante.net> | 2009-09-12 16:46:53 +0000 |
| commit | 28ef6c316f1aff914bb95ac09787a3c83c1815fd (patch) | |
| tree | 2812fe7ffc9beec4f99856906ddfcafda54cf16a /builtins/ulimit.def | |
| parent | bb70624e964126b7ac4ff085ba163a9c35ffa18f (diff) | |
| download | android_external_bash-28ef6c316f1aff914bb95ac09787a3c83c1815fd.tar.gz android_external_bash-28ef6c316f1aff914bb95ac09787a3c83c1815fd.tar.bz2 android_external_bash-28ef6c316f1aff914bb95ac09787a3c83c1815fd.zip | |
Imported from ../bash-2.05.tar.gz.
Diffstat (limited to 'builtins/ulimit.def')
| -rw-r--r-- | builtins/ulimit.def | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/builtins/ulimit.def b/builtins/ulimit.def index e57e76d..a9d5d6a 100644 --- a/builtins/ulimit.def +++ b/builtins/ulimit.def @@ -202,6 +202,9 @@ static RESOURCE_LIMITS limits[] = { #if defined (HAVE_RESOURCE) { 'v', RLIMIT_VIRTMEM, RLIMIT_VMBLKSZ, "virtual memory (kbytes)" }, #endif +#ifdef RLIMIT_SWAP + { 'w', RLIMIT_SWAP, 1024, "swap size (kbytes)" }, +#endif { -1, -1, -1, (char *)NULL } }; #define NCMDS (sizeof(limits) / sizeof(limits[0])) @@ -476,7 +479,13 @@ set_limit (ind, newlim, mode) case RLIMIT_OPENFILES: #if defined (HAVE_SETDTABLESIZE) +# if defined (__CYGWIN__) + /* Grrr... Cygwin declares setdtablesize as void. */ + setdtablesize (newlim); + return 0; +# else return (setdtablesize (newlim)); +# endif #endif case RLIMIT_PIPESIZE: case RLIMIT_VIRTMEM: @@ -495,6 +504,7 @@ set_limit (ind, newlim, mode) newlim /= 512; /* Ugh. */ # endif /* HPUX9 */ val = (current_user.euid != 0 && newlim == RLIM_INFINITY && + (mode & LIMIT_HARD) == 0 && /* XXX -- test */ (limit.rlim_cur <= limit.rlim_max)) ? limit.rlim_max : newlim; if (mode & LIMIT_SOFT) |