31935: further updates to limits for BSD

4 files changed, 20 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 198147ed4..85eaf3d98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-03  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* Stefan Neudorf: 31935: Doc/Zsh/builtins.yo,
+	Src/Builtins/rlimits.awk, Src/Builtins/rlimits.c: further
+	limit updates for 31930, 39134.
+
 2013-10-31  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* Stefan Neudorf: 31930 / 31934: Doc/Zsh/builtins.yo,
diff --git a/Doc/Zsh/builtins.yo b/Doc/Zsh/builtins.yo
index f33685b66..b9b504de8 100644
--- a/Doc/Zsh/builtins.yo
+++ b/Doc/Zsh/builtins.yo
@@ -1003,20 +1003,20 @@ sitem(tt(cputime))(Maximum CPU seconds per process.)
 sitem(tt(datasize))(Maximum data size (including stack) for each process.)
 sitem(tt(descriptors))(Maximum value for a file descriptor.)
 sitem(tt(filesize))(Largest single file allowed.)
+sitem(tt(kqueues))(Maximum number of kqueues allocated.)
 sitem(tt(maxproc))(Maximum number of processes.)
 sitem(tt(maxpthreads))(Maximum number of threads per process.)
 sitem(tt(memorylocked))(Maximum amount of memory locked in RAM.)
 sitem(tt(memoryuse))(Maximum resident set size.)
 sitem(tt(msgqueue))(Maximum number of bytes in POSIX message queues.)
+sitem(tt(posixlocks))(Maximum number of POSIX locks per user.)
+sitem(tt(pseudoterminals))(Maximum number of pseudo-terminals.)
 sitem(tt(resident))(Maximum resident set size.)
 sitem(tt(sigpending))(Maximum number of pending signals.)
 sitem(tt(sockbufsize))(Maximum size of all socket buffers.)
 sitem(tt(stacksize))(Maximum stack size for each process.)
+sitem(tt(swapsize))(Maximum amount of swap used.)
 sitem(tt(vmemorysize))(Maximum amount of virtual memory.)
-sitem(tt(posixlocks))(Maximum number of POSIX locks per user.)
-sitem(tt(pseudoterminals))(Maximum number of pseudo-terminals.)
-sitem(tt(swapuse))(Maximum amount of swap used.)
-sitem(tt(kqueues))(Maximum number of kqueues allocated.)
 endsitem()
 
 Which of these resource limits are available depends on the system.
@@ -1897,7 +1897,7 @@ enditem()
 findex(ulimit)
 cindex(resource limits)
 cindex(limits, resource)
-item(tt(ulimit) [ [ tt(-SHacdfikKlmnpqrstvwx) | tt(-N) var(resource) [ var(limit) ] ... ])(
+item(tt(ulimit) [ [ tt(-SHacdfiklmnpqrstvwx) | tt(-N) var(resource) [ var(limit) ] ... ])(
 Set or display resource limits of the shell and the processes started by
 the shell.  The value of var(limit) can be a number in the unit specified
 below or one of the values `tt(unlimited)', which removes the limit on the
@@ -1928,13 +1928,11 @@ sitem(tt(-c))(512-byte blocks on the size of core dumps.)
 sitem(tt(-d))(Kilobytes on the size of the data segment.)
 sitem(tt(-f))(512-byte blocks on the size of files written.)
 sitem(tt(-i))(The number of pending signals.)
-sitem(tt(-k))(Maximum number of kqueues allocated.)
-sitem(tt(-K))(Maximum number of POSIX locks per user.  Note this is
-tt(-k) in some other shells.)
+sitem(tt(-k))(The number of kqueues allocated.)
 sitem(tt(-l))(Kilobytes on the size of locked-in memory.)
 sitem(tt(-m))(Kilobytes on the size of physical memory.)
 sitem(tt(-n))(open file descriptors.)
-sitem(tt(-p))(Maximum number of pseudo-terminals.)
+sitem(tt(-p))(The number of pseudo-terminals.)
 sitem(tt(-q))(Bytes in POSIX message queues.)
 sitem(tt(-s))(Kilobytes on the size of the stack.)
 sitem(tt(-t))(CPU seconds to be used.)
@@ -1942,7 +1940,7 @@ sitem(tt(-r))(The number of simultaneous threads available to the user.)
 sitem(tt(-u))(The number of processes available to the user.)
 sitem(tt(-v))(Kilobytes on the size of virtual memory.  On some systems this
 refers to the limit called `address space'.)
-sitem(tt(-w))(Maximum amount of swap memory.)
+sitem(tt(-w))(Kilobytes on the size of swapped out memory.)
 sitem(tt(-x))(The number of locks on files.)
 endsitem()
 
diff --git a/Src/Builtins/rlimits.awk b/Src/Builtins/rlimits.awk
index ccee49e87..b5a25fd83 100644
--- a/Src/Builtins/rlimits.awk
+++ b/Src/Builtins/rlimits.awk
@@ -57,7 +57,7 @@ BEGIN {limidx = 0}
 	    if (limnam == "RTTIME") { msg[limnum] = "Urt_time" }
 	    if (limnam == "POSIXLOCKS") { msg[limnum] = "Nposixlocks" }
 	    if (limnam == "NPTS")    { msg[limnum] = "Npseudoterminals" }
-	    if (limnam == "SWAP")    { msg[limnum] = "Mswapuse" }
+	    if (limnam == "SWAP")    { msg[limnum] = "Mswapsize" }
 	    if (limnam == "KQUEUES") { msg[limnum] = "Nkqueues" }
         }
     }
diff --git a/Src/Builtins/rlimits.c b/Src/Builtins/rlimits.c
index a0f294876..e48a1d3e3 100644
--- a/Src/Builtins/rlimits.c
+++ b/Src/Builtins/rlimits.c
@@ -32,6 +32,10 @@
 
 #if defined(HAVE_GETRLIMIT) && defined(RLIM_INFINITY)
 
+#ifdef RLIMIT_POSIXLOCKS
+#  define RLIMIT_LOCKS		RLIMIT_POSIXLOCKS
+#endif
+
 enum {
     ZLIMTYPE_MEMORY,
     ZLIMTYPE_NUMBER,
@@ -386,12 +390,6 @@ printulimit(char *nam, int lim, int hard, int head)
 	    printf("-r: max rt priority                 ");
 	break;
 # endif /* HAVE_RLIMIT_RTPRIO */
-# ifdef HAVE_RLIMIT_POSIXLOCKS
-    case RLIMIT_POSIXLOCKS:
-	if (head)
-	    printf("-K: posixlocks                      ");
-	break;
-# endif /* HAVE_RLIMIT_POSIXLOCKS */
 # ifdef HAVE_RLIMIT_NPTS
     case RLIMIT_NPTS:
 	if (head)
@@ -401,7 +399,7 @@ printulimit(char *nam, int lim, int hard, int head)
 # ifdef HAVE_RLIMIT_SWAP
     case RLIMIT_SWAP:
 	if (head)
-	    printf("-w: swap limit (kbytes)             ");
+	    printf("-w: swap size (kbytes)              ");
 	if (limit != RLIM_INFINITY)
 	    limit /= 1024;
 	break;
@@ -870,11 +868,6 @@ bin_ulimit(char *name, char **argv, UNUSED(Options ops), UNUSED(int func))
 		    res = RLIMIT_RTPRIO;
 		    break;
 # endif
-# ifdef HAVE_RLIMIT_POSIXLOCKS
-		case 'K':
-		    res = RLIMIT_POSIXLOCKS;
-		    break;
-# endif
 # ifdef HAVE_RLIMIT_NPTS
 		case 'p':
 		    res = RLIMIT_NPTS;