Re: pkgsrc patches for zsh [was Re: tgoto issue in zsh-5.0.0]

[Peter Stephenson <Peter.Stephenson@csr.com>]

On Fri, 17 Aug 2012 12:50:19 +0200
Thomas Klausner <tk@giga.or.at> wrote:
> What's the "-N  9" part, should that be support explicitly as well?

Ah, I noticed that but didn't see it on your list from sh --- now I look
more closely, that's -b, so that should be added too.  We support the
resource, just not the option letter.  It's done as bytes, not
kilobytes, so I changed that, too.

Index: Doc/Zsh/builtins.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/builtins.yo,v
retrieving revision 1.140
diff -p -u -r1.140 builtins.yo
--- Doc/Zsh/builtins.yo	17 Aug 2012 11:12:35 -0000	1.140
+++ Doc/Zsh/builtins.yo	17 Aug 2012 11:34:10 -0000
@@ -1764,6 +1764,7 @@ tt(ulimit -a) will show which are suppor
 
 startsitem()
 sitem(tt(-a))(Lists all of the current resource limits.)
+sitem(tt(-b))(Socket buffer size in bytes LPAR()N.B. not kilobytes+RPAR())
 sitem(tt(-c))(512-byte blocks on the size of core dumps.)
 sitem(tt(-d))(K-bytes on the size of the data segment.)
 sitem(tt(-f))(512-byte blocks on the size of files written.)
Index: Src/Builtins/rlimits.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Builtins/rlimits.c,v
retrieving revision 1.26
diff -p -u -r1.26 rlimits.c
--- Src/Builtins/rlimits.c	17 Aug 2012 11:12:35 -0000	1.26
+++ Src/Builtins/rlimits.c	17 Aug 2012 11:34:10 -0000
@@ -365,9 +365,7 @@ printulimit(char *nam, int lim, int hard
 # ifdef HAVE_RLIMIT_SBSIZE
     case RLIMIT_SBSIZE:
 	if (head)
-	    printf("-N %2d: socket buffer size (kb) ", RLIMIT_SBSIZE);
-	if (limit != RLIM_INFINITY)
-	    limit /= 1024;
+	    printf("-b: socket buffer size (bytes)", RLIMIT_SBSIZE);
 	break;
 # endif /* HAVE_RLIMIT_SBSIZE */
 # ifdef HAVE_RLIMIT_PTHREAD
@@ -782,16 +780,21 @@ bin_ulimit(char *name, char **argv, UNUS
 		case 'c':
 		    res = RLIMIT_CORE;
 		    break;
-# ifdef HAVE_RLIMIT_RSS
-		case 'm':
-		    res = RLIMIT_RSS;
+# ifdef HAVE_RLIMIT_SBSIZE
+		case 'b':
+		    res = RLIMIT_SBSIZE;
 		    break;
-# endif /* HAVE_RLIMIT_RSS */
+# endif /* HAVE_RLIMIT_SBSIZE */
 # ifdef HAVE_RLIMIT_MEMLOCK
 		case 'l':
 		    res = RLIMIT_MEMLOCK;
 		    break;
 # endif /* HAVE_RLIMIT_MEMLOCK */
+# ifdef HAVE_RLIMIT_RSS
+		case 'm':
+		    res = RLIMIT_RSS;
+		    break;
+# endif /* HAVE_RLIMIT_RSS */
 # ifdef HAVE_RLIMIT_NOFILE
 		case 'n':
 		    res = RLIMIT_NOFILE;

-- 
Peter Stephenson <pws@csr.com>            Software Engineer
Tel: +44 (0)1223 692070                   Cambridge Silicon Radio Limited
Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, UK


Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom
More information can be found at www.csr.com. Follow CSR on Twitter at http://twitter.com/CSR_PLC and read our blog at www.csr.com/blog