From: Enrico Scholz Date: Wed, 22 Oct 2003 18:22:44 +0000 (+0000) Subject: added [mMkK] modifies for limits X-Git-Tag: VERSION_0_10~1136 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4886764f5c0d5fb3cbc4df2211c219f9a83f9ca4;p=util-vserver.git added [mMkK] modifies for limits git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@280 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/src/exec-ulimit.c b/util-vserver/src/exec-ulimit.c index a0a484c..c599220 100644 --- a/util-vserver/src/exec-ulimit.c +++ b/util-vserver/src/exec-ulimit.c @@ -58,6 +58,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);