summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2004-08-07 16:46:33 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2004-08-07 16:46:33 +0000
commitb1edebcb26826a603b4b7e34812a25ebf585900e (patch)
tree070c0acf7af2af424b824d2c706ddc512397d3ca
parent2d311a1310982c3a310c0f912dd736bd8abbc652 (diff)
vmemsize -> vmemoryuse for consistency with tcsh and document. mickey@ OK
-rw-r--r--bin/csh/csh.14
-rw-r--r--bin/csh/func.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/bin/csh/csh.1 b/bin/csh/csh.1
index ce14d95f863..0d466b5bf86 100644
--- a/bin/csh/csh.1
+++ b/bin/csh/csh.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: csh.1,v 1.52 2004/04/21 09:04:07 jmc Exp $
+.\" $OpenBSD: csh.1,v 1.53 2004/08/07 16:46:32 millert Exp $
.\" $NetBSD: csh.1,v 1.10 1995/03/21 09:02:35 cgd Exp $
.\"
.\" Copyright (c) 1980, 1990, 1993
@@ -1858,6 +1858,8 @@ function.
The maximum number of simultaneous processes for this user ID.
.It Ar openfiles
The maximum number of simultaneous open files for this user ID.
+.It Ar vmemoryuse
+the maximum size (in bytes) to which a process's total size may grow.
.El
.Pp
The
diff --git a/bin/csh/func.c b/bin/csh/func.c
index 39a122991db..ad20e750edf 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: func.c,v 1.22 2004/08/06 19:23:58 mickey Exp $ */
+/* $OpenBSD: func.c,v 1.23 2004/08/07 16:46:32 millert Exp $ */
/* $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $ */
/*-
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)func.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$OpenBSD: func.c,v 1.22 2004/08/06 19:23:58 mickey Exp $";
+static char rcsid[] = "$OpenBSD: func.c,v 1.23 2004/08/07 16:46:32 millert Exp $";
#endif
#endif /* not lint */
@@ -1089,7 +1089,7 @@ static struct limits {
{ RLIMIT_NPROC, "maxproc", 1, "" },
{ RLIMIT_NOFILE, "openfiles", 1, "" },
#ifdef RLIMIT_VMEM
- { RLIMIT_VMEM, "vmemsize", 1024, "kbytes" },
+ { RLIMIT_VMEM, "vmemoryuse", 1024, "kbytes" },
#endif
{ -1, NULL, 0, NULL }
};