summaryrefslogtreecommitdiff
path: root/bin/csh
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2004-08-08 12:55:29 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2004-08-08 12:55:29 +0000
commitadaddf3b1f1a6260a9fe2d9eb21d2c1d1e23ea3f (patch)
treef159be027a74aaf814503b44dfa28feef5602b8c /bin/csh
parentd99477df57c13e32aa30c6aad6795ffff5c4cd01 (diff)
print vmemoryuse immediately after vmemoryuse in limit output
Diffstat (limited to 'bin/csh')
-rw-r--r--bin/csh/func.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/bin/csh/func.c b/bin/csh/func.c
index ad20e750edf..7c5834f4986 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: func.c,v 1.23 2004/08/07 16:46:32 millert Exp $ */
+/* $OpenBSD: func.c,v 1.24 2004/08/08 12:55:28 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.23 2004/08/07 16:46:32 millert Exp $";
+static char rcsid[] = "$OpenBSD: func.c,v 1.24 2004/08/08 12:55:28 millert Exp $";
#endif
#endif /* not lint */
@@ -1085,12 +1085,12 @@ static struct limits {
{ RLIMIT_STACK, "stacksize", 1024, "kbytes" },
{ RLIMIT_CORE, "coredumpsize", 1024, "kbytes" },
{ RLIMIT_RSS, "memoryuse", 1024, "kbytes" },
- { RLIMIT_MEMLOCK, "memorylocked", 1024, "kbytes" },
- { RLIMIT_NPROC, "maxproc", 1, "" },
- { RLIMIT_NOFILE, "openfiles", 1, "" },
#ifdef RLIMIT_VMEM
{ RLIMIT_VMEM, "vmemoryuse", 1024, "kbytes" },
#endif
+ { RLIMIT_MEMLOCK, "memorylocked", 1024, "kbytes" },
+ { RLIMIT_NPROC, "maxproc", 1, "" },
+ { RLIMIT_NOFILE, "openfiles", 1, "" },
{ -1, NULL, 0, NULL }
};