JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drop RLIMIT_LOCKS completely, it was for early Linux 2.4 versions only

Browse Source
This commit is contained in:
tg
2013-11-17 22:20:21 +00:00
parent 61886de5ee
commit 44a58fb3e9
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
funcs.c
View File

@ -38,7 +38,7 @@
#endif
#endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.248 2013/11/17 22:19:41 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.249 2013/11/17 22:20:20 tg Exp $");
#if HAVE_KILLPG
/*
@ -3426,9 +3426,6 @@ c_ulimit(const char **wp)
#ifdef RLIMIT_SWAP
{ "swap(KiB)", RLIMIT_SWAP, 1024, 'w' },
#endif
#ifdef RLIMIT_LOCKS
{ "flocks", RLIMIT_LOCKS, -1, 'L' },
#endif
#ifdef RLIMIT_TIME
{ "humantime(seconds)", RLIMIT_TIME, 1, 'T' },
#endif
@ -3497,9 +3494,6 @@ c_ulimit(const char **wp)
#ifdef RLIMIT_SIGPENDING
"i"
#endif
#ifdef RLIMIT_LOCKS
"L"
#endif
#ifdef RLIMIT_MEMLOCK
"l"
#endif
@ -3619,7 +3613,11 @@ set_ulimit(const struct limits *l, const char *v, int how)
}
if (getrlimit(l->resource, &limit) < 0) {
/* some can't be read, e.g. Linux RLIMIT_LOCKS */
#ifndef MKSH_SMALL
bi_errorf("limit %s could not be read, contact the mksh developers: %s",
l->name, cstrerror(errno));
#endif
/* some can't be read */
limit.rlim_cur = RLIM_INFINITY;
limit.rlim_max = RLIM_INFINITY;
}