diff options
| author | joerg <joerg@FreeBSD.org> | 1995-10-21 00:47:32 +0000 |
|---|---|---|
| committer | joerg <joerg@FreeBSD.org> | 1995-10-21 00:47:32 +0000 |
| commit | 8deb9482ef65a6a3a773ac996395624316ba29cc (patch) | |
| tree | 7f0e2b4fc502147d3a8088d2f968895f03e09628 /bin/sh/miscbltin.c | |
| parent | e22d8066c4c8851a3d1ce3cc8c5e5393cc6d148b (diff) | |
| download | FreeBSD-src-8deb9482ef65a6a3a773ac996395624316ba29cc.zip FreeBSD-src-8deb9482ef65a6a3a773ac996395624316ba29cc.tar.gz | |
o rename ulimit -p into ulimit -u, so we are in agreement with bash
o fix brokeness for 1>&5 redirection, where `5' was an invalid file
descriptor, but no error message has been generated
o fix brokeness for redirect to/from myself case
Diffstat (limited to 'bin/sh/miscbltin.c')
| -rw-r--r-- | bin/sh/miscbltin.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c index be7f0f7..414ed81 100644 --- a/bin/sh/miscbltin.c +++ b/bin/sh/miscbltin.c @@ -34,7 +34,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: miscbltin.c,v 1.2 1994/09/24 02:57:52 davidg Exp $ + * $Id: miscbltin.c,v 1.3 1995/10/19 18:42:10 joerg Exp $ */ #ifndef lint @@ -209,7 +209,7 @@ static struct restab restab[] = { {RLIMIT_FSIZE, 512, "filesize(512-blocks) "}, {RLIMIT_MEMLOCK, 1024, "lockedmem(kilobytes) "}, {RLIMIT_NOFILE, 1, "nofiles(descriptors) "}, - {RLIMIT_NPROC, 1, "processes(max) "}, + {RLIMIT_NPROC, 1, "userprocs(max) "}, {RLIMIT_RSS, 1024, "memoryuse(kilobytes) "}, {RLIMIT_STACK, 1024, "stacksize(kilobytes) "} }; @@ -265,7 +265,7 @@ ulimitcmd(argc, argv) char **argv; { opterr = 0; /* use own error processing */ optreset = 1; optind = 1; - while ((i = getopt(argc, argv, "HSacdfnstmlp")) != EOF) { + while ((i = getopt(argc, argv, "HSacdfnstmlu")) != EOF) { arg++; switch(i) { case 'H': @@ -313,7 +313,7 @@ ulimitcmd(argc, argv) char **argv; { if(resource != RLIMIT_UNSPEC) errs++; resource = RLIMIT_MEMLOCK; break; - case 'p': + case 'u': if(resource != RLIMIT_UNSPEC) errs++; resource = RLIMIT_NPROC; break; |
