diff --git a/funcs.c b/funcs.c index 1552baf..2e3a4f7 100644 --- a/funcs.c +++ b/funcs.c @@ -1,4 +1,4 @@ -/** $MirOS: src/bin/mksh/funcs.c,v 1.10 2005/06/08 10:14:08 tg Exp $ */ +/** $MirOS: src/bin/mksh/funcs.c,v 1.11 2005/06/08 10:25:40 tg Exp $ */ /* $OpenBSD: c_ksh.c,v 1.27 2005/03/30 17:16:37 deraadt Exp $ */ /* $OpenBSD: c_sh.c,v 1.29 2005/03/30 17:16:37 deraadt Exp $ */ /* $OpenBSD: c_test.c,v 1.17 2005/03/30 17:16:37 deraadt Exp $ */ @@ -13,7 +13,7 @@ #include #endif -__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.10 2005/06/08 10:14:08 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.11 2005/06/08 10:25:40 tg Exp $"); int c_cd(char **wp) @@ -2869,9 +2869,6 @@ c_ulimit(char **wp) #ifdef RLIMIT_VMEM { "vmemory(KiB)", RLIMIT, RLIMIT_VMEM, RLIMIT_VMEM, 1024, 'v' }, -#elif defined(RLIMIT_AS) - { "amemory(KiB)", RLIMIT, RLIMIT_AS, RLIMIT_AS, - 1024, 'v' }, #endif #ifdef RLIMIT_SWAP { "swap(KiB)", RLIMIT, RLIMIT_SWAP, RLIMIT_SWAP, diff --git a/mksh.1 b/mksh.1 index d6c3257..efc85df 100644 --- a/mksh.1 +++ b/mksh.1 @@ -1,4 +1,4 @@ -.\" $MirOS: src/bin/mksh/mksh.1,v 1.6 2005/06/08 10:14:09 tg Exp $ +.\" $MirOS: src/bin/mksh/mksh.1,v 1.7 2005/06/08 10:25:40 tg Exp $ .\" $OpenBSD: ksh.1,v 1.98 2005/05/12 09:18:24 jmc Exp $ .\" $OpenBSD: sh.1tbl,v 1.53 2004/12/10 01:56:56 jaredy Exp $ .\"- @@ -4158,9 +4158,8 @@ CPU seconds spent in user mode to be used by each process. .It Fl v Ar n Impose a limit of .Ar n -kibibytes on the amount of virtual memory used. -If the operating system has no concept of a virtual memory -limit, an available memory limit is used instead. +kibibytes on the amount of virtual memory (on some +operating systems: total address space) used. .It Fl w Ar n Impose a limit of .Ar n