From BM-2cXppXU4T67w7j6NCir9T1WdzBHmFgBnLj@bitmessage.ch  Wed Oct 30 13:32:34 2013
Return-Path: <BM-2cXppXU4T67w7j6NCir9T1WdzBHmFgBnLj@bitmessage.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTP id 6EE66941
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Oct 2013 13:32:34 +0000 (UTC)
	(envelope-from BM-2cXppXU4T67w7j6NCir9T1WdzBHmFgBnLj@bitmessage.ch)
Received: from mail.bitmessage.ch (unknown [IPv6:2002:92e4:70fc::92e4:70fc])
	by mx1.freebsd.org (Postfix) with SMTP id D8498217F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 30 Oct 2013 13:32:33 +0000 (UTC)
Received: from nil ([127.0.0.1])
	by mail.bitmessage.ch
	; Wed, 30 Oct 2013 14:31:36 +0100
Message-Id: <20131030.86sivirikl@bitmessage.ch>
Date: Wed, 30 Oct 2013 14:31:38 +0100
From: Stefan Neudorf <BM-2cXppXU4T67w7j6NCir9T1WdzBHmFgBnLj@bitmessage.ch>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [PATCH] usr.bin/limits: wrong limit name for csh/tcsh
X-GNATS-Notify: kib@FreeBSD.org

>Number:         183480
>Category:       bin
>Synopsis:       [PATCH] usr.bin/limits: wrong limit name for csh/tcsh
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kib
>State:          patched
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Oct 30 13:40:00 UTC 2013
>Closed-Date:    
>Last-Modified:  Fri Nov 01 06:17:03 UTC 2013
>Originator:     Stefan Neudorf
>Release:        
>Organization:
>Environment:
>Description:
r194767 added swaplimit to in-tree tcsh.
r195609 renamed swaplimit to swapsize.

swapuse never existed in tcsh, so eval `limit -e` usage in scripts would
never set the limit.
>How-To-Repeat:
 > limit swapuse 5
 limit: No such limit.
 > limits -e -w 5k
 limit -h swapuse 5;
 limit swapuse 5;
>Fix:
--- swapsize_csh_limit.diff begins here ---
Index: usr.bin/limits/limits.c
===================================================================
--- usr.bin/limits/limits.c	(revision 257346)
+++ usr.bin/limits/limits.c	(working copy)
@@ -125,7 +125,7 @@ static struct {
 	  { "limit%s sbsize %s",          ";\n",  1    },
 	  { "limit%s vmemoryuse %s",      ";\n",  1024 },
 	  { "limit%s pseudoterminals %s", ";\n",  1    },
-	  { "limit%s swapuse %s",         ";\n",  1024 },
+	  { "limit%s swapsize %s",        ";\n",  1024 },
 	  { "limit%s kqueues %s",         ";\n",  1    },
       }
     },
@@ -160,7 +160,7 @@ static struct {
 	  { "limit%s sbsize %s",          ";\n",  1    },
 	  { "limit%s vmemoryuse %s",      ";\n",  1024 },
 	  { "limit%s pseudoterminals %s", ";\n",  1    },
-	  { "limit%s swapuse %s",         ";\n",  1024 },
+	  { "limit%s swapsize %s",        ";\n",  1024 },
 	  { "limit%s kqueues %s",         ";\n",  1    },
       }
     },
--- swapsize_csh_limit.diff ends here ---

>Release-Note:
>Audit-Trail:

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/183480: commit references a PR
Date: Thu, 31 Oct 2013 08:22:36 +0000 (UTC)

 Author: kib
 Date: Thu Oct 31 08:22:29 2013
 New Revision: 257426
 URL: http://svnweb.freebsd.org/changeset/base/257426
 
 Log:
   The limit for the swap space is spelled 'swapsize', at least since
   tcsh 6.17.00 import.
   
   Submitted by:	Stefan Neudorf
   PR:	bin/183480
   MFC after:	1 week
 
 Modified:
   head/usr.bin/limits/limits.c
 
 Modified: head/usr.bin/limits/limits.c
 ==============================================================================
 --- head/usr.bin/limits/limits.c	Thu Oct 31 06:36:41 2013	(r257425)
 +++ head/usr.bin/limits/limits.c	Thu Oct 31 08:22:29 2013	(r257426)
 @@ -125,7 +125,7 @@ static struct {
  	  { "limit%s sbsize %s",          ";\n",  1    },
  	  { "limit%s vmemoryuse %s",      ";\n",  1024 },
  	  { "limit%s pseudoterminals %s", ";\n",  1    },
 -	  { "limit%s swapuse %s",         ";\n",  1024 },
 +	  { "limit%s swapsize %s",        ";\n",  1024 },
  	  { "limit%s kqueues %s",         ";\n",  1    },
        }
      },
 @@ -160,7 +160,7 @@ static struct {
  	  { "limit%s sbsize %s",          ";\n",  1    },
  	  { "limit%s vmemoryuse %s",      ";\n",  1024 },
  	  { "limit%s pseudoterminals %s", ";\n",  1    },
 -	  { "limit%s swapuse %s",         ";\n",  1024 },
 +	  { "limit%s swapsize %s",        ";\n",  1024 },
  	  { "limit%s kqueues %s",         ";\n",  1    },
        }
      },
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/183480: commit references a PR
Date: Thu, 31 Oct 2013 08:58:39 +0000 (UTC)

 Author: kib
 Date: Thu Oct 31 08:58:32 2013
 New Revision: 257427
 URL: http://svnweb.freebsd.org/changeset/base/257427
 
 Log:
   The limit for the swap space is spelled 'swapsize', at least since
   tcsh 6.17.00 import.
   
   Submitted by:	Stefan Neudorf
   PR:	bin/183480
   MFC after:	1 week
 
 Modified:
   head/usr.bin/limits/limits.c
 
 Modified: head/usr.bin/limits/limits.c
 ==============================================================================
 --- head/usr.bin/limits/limits.c	Thu Oct 31 08:22:29 2013	(r257426)
 +++ head/usr.bin/limits/limits.c	Thu Oct 31 08:58:32 2013	(r257427)
 @@ -248,7 +248,7 @@ static struct {
   * to be modified accordingly!
   */
  
 -#define RCS_STRING  "tfdscmlunbvpw"
 +#define RCS_STRING  "tfdscmlunbvpwk"
  
  static rlim_t resource_num(int which, int ch, const char *str);
  static void usage(void);
 @@ -287,7 +287,7 @@ main(int argc, char *argv[])
  
      pid = -1;
      optarg = NULL;
 -    while ((ch = getopt(argc, argv, ":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:")) != -1) {
 +    while ((ch = getopt(argc, argv, ":EeC:U:BSHP:ab:c:d:f:l:m:n:s:t:u:v:p:w:k:")) != -1) {
  	switch(ch) {
  	case 'a':
  	    doall = 1;
 @@ -544,7 +544,7 @@ usage(void)
  {
      (void)fprintf(stderr,
  	"usage: limits [-C class|-P pid|-U user] [-eaSHBE] "
 -	"[-bcdflmnstuvpw [val]] [[name=val ...] cmd]\n");
 +	"[-bcdflmnstuvpwk [val]] [[name=val ...] cmd]\n");
      exit(EXIT_FAILURE);
  }
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
Responsible-Changed-From-To: freebsd-bugs->mp 
Responsible-Changed-By: mp 
Responsible-Changed-When: Thu Oct 31 16:31:53 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183480 
State-Changed-From-To: open->patched 
State-Changed-By: kib 
State-Changed-When: Fri Nov 1 06:16:34 UTC 2013 
State-Changed-Why:  
I already committed the patch. 


Responsible-Changed-From-To: mp->kib 
Responsible-Changed-By: kib 
Responsible-Changed-When: Fri Nov 1 06:16:34 UTC 2013 
Responsible-Changed-Why:  
I already committed the patch. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183480 
>Unformatted:
