X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Fexec-ulimit.c;h=39dc59ecf2059acaa26352d585a2c4acf7d44a9d;hb=a917f24ef7b003dcef54a3db2644cf9cb4bc2db2;hp=a0a484cd2a30c0bdb25b6a07ec80271728f1d6db;hpb=0282de7ba7437f7213282185710b2682d9b79dc4;p=util-vserver.git diff --git a/util-vserver/src/exec-ulimit.c b/util-vserver/src/exec-ulimit.c index a0a484c..39dc59e 100644 --- a/util-vserver/src/exec-ulimit.c +++ b/util-vserver/src/exec-ulimit.c @@ -20,12 +20,19 @@ # include #endif -#include "wrappers.h" #include "util.h" #include #include #include +#include +#include + +#define ENSC_WRAPPERS_PREFIX "exec-ulimit: " +#define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_FCNTL 1 +#define ENSC_WRAPPERS_RESOURCE 1 +#include #define DECLARE_LIMIT(RES,FNAME) { #FNAME, RLIMIT_##RES } @@ -58,6 +65,16 @@ readValue(int fd, char const *filename) if (strncmp(buf, "inf", 3)==0) return RLIM_INFINITY; res = strtol(buf, &errptr, 0); + if (errptr!=buf) { + switch (*errptr) { + case 'M' : res *= 1024; /* fallthrough */ + case 'K' : res *= 1024; ++errptr; break; + case 'm' : res *= 1000; /* fallthrough */ + case 'k' : res *= 1000; ++errptr; break; + default : break; + } + } + if (errptr==buf || (*errptr!='\0' && *errptr!='\n')) { WRITE_MSG(2, "Invalid limit in '"); WRITE_STR(2, filename);