summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Michael <fedora.dm0@gmail.com>2016-08-04 04:09:54 -0700
committerLennart Poettering <lennart@poettering.net>2016-08-04 13:09:54 +0200
commit5124866d7355b685c08aef6abc618e03367e4b93 (patch)
tree5b29b609bffc7684facdfd21c08267ed278798e6 /src
parent19c8201744035d92a6480cc58944c0c18fcebdc6 (diff)
util-lib: add parse_percent_unbounded() for percentages over 100% (#3886)
This permits CPUQuota to accept greater values as documented.
Diffstat (limited to 'src')
-rw-r--r--src/basic/parse-util.c11
-rw-r--r--src/basic/parse-util.h1
-rw-r--r--src/core/load-fragment.c2
-rw-r--r--src/shared/bus-unit-util.c2
4 files changed, 12 insertions, 4 deletions
diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index 503a895731..11849ade0b 100644
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -533,7 +533,7 @@ int parse_fractional_part_u(const char **p, size_t digits, unsigned *res) {
return 0;
}
-int parse_percent(const char *p) {
+int parse_percent_unbounded(const char *p) {
const char *pc, *n;
unsigned v;
int r;
@@ -546,8 +546,15 @@ int parse_percent(const char *p) {
r = safe_atou(n, &v);
if (r < 0)
return r;
+
+ return (int) v;
+}
+
+int parse_percent(const char *p) {
+ int v = parse_percent_unbounded(p);
+
if (v > 100)
return -ERANGE;
- return (int) v;
+ return v;
}
diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index 73441bb6fd..f0fa5f9752 100644
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -106,4 +106,5 @@ int safe_atod(const char *s, double *ret_d);
int parse_fractional_part_u(const char **s, size_t digits, unsigned *res);
+int parse_percent_unbounded(const char *p);
int parse_percent(const char *p);
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index e8cb3a4249..d5f035b67f 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2903,7 +2903,7 @@ int config_parse_cpu_quota(
return 0;
}
- r = parse_percent(rvalue);
+ r = parse_percent_unbounded(rvalue);
if (r <= 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "CPU quota '%s' invalid. Ignoring.", rvalue);
return 0;
diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c
index 14bf8ad627..589f9d46e9 100644
--- a/src/shared/bus-unit-util.c
+++ b/src/shared/bus-unit-util.c
@@ -84,7 +84,7 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen
if (isempty(eq))
r = sd_bus_message_append(m, "sv", "CPUQuotaPerSecUSec", "t", USEC_INFINITY);
else {
- r = parse_percent(eq);
+ r = parse_percent_unbounded(eq);
if (r <= 0) {
log_error_errno(r, "CPU quota '%s' invalid.", eq);
return -EINVAL;