diff options
| author | Ingo Bürk <admin@airblader.de> | 2018-10-26 09:24:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-26 09:24:45 +0200 |
| commit | be5f38e0a63a0ba96b27bc3375649c58b6df9b6d (patch) | |
| tree | d2ccdbb8cebb08fe381d90952e897af297c681ab | |
| parent | 13f720ab752d61447cf7b4c06cd9a011b0d17bea (diff) | |
| parent | aa572d24b5ecf16a064f924548ed1926b7b231d6 (diff) | |
Merge pull request #318 from gportay/fix-invalid-cpu-placeholder
print_cpu_usage: fix invalid %cpu placeholder output
| -rw-r--r-- | src/print_cpu_usage.c | 2 | ||||
| -rw-r--r-- | testcases/024-cpu-usage-invalid-cpu/expected_output.pl | 7 | ||||
| -rw-r--r-- | testcases/024-cpu-usage-invalid-cpu/i3status.conf | 9 |
3 files changed, 17 insertions, 1 deletions
diff --git a/src/print_cpu_usage.c b/src/print_cpu_usage.c index 1fccba4..411d5f4 100644 --- a/src/print_cpu_usage.c +++ b/src/print_cpu_usage.c @@ -151,7 +151,7 @@ void print_cpu_usage(yajl_gen json_gen, char *buffer, const char *format, const } #if defined(LINUX) else if (BEGINS_WITH(walk + 1, "cpu")) { - int number = 0; + int number = -1; sscanf(walk + 1, "cpu%d", &number); if (number < 0 || number >= cpu_count) { fprintf(stderr, "provided CPU number '%d' above detected number of CPU %d\n", number, cpu_count); diff --git a/testcases/024-cpu-usage-invalid-cpu/expected_output.pl b/testcases/024-cpu-usage-invalid-cpu/expected_output.pl new file mode 100644 index 0000000..45111a6 --- /dev/null +++ b/testcases/024-cpu-usage-invalid-cpu/expected_output.pl @@ -0,0 +1,7 @@ +#!/usr/bin/env perl + +use v5.10; +use strict; +use warnings; + +print "CPU: \n"; diff --git a/testcases/024-cpu-usage-invalid-cpu/i3status.conf b/testcases/024-cpu-usage-invalid-cpu/i3status.conf new file mode 100644 index 0000000..d32784f --- /dev/null +++ b/testcases/024-cpu-usage-invalid-cpu/i3status.conf @@ -0,0 +1,9 @@ +general { + output_format = "none" +} + +order += "cpu_usage" + +cpu_usage { + format = "CPU: %cpu" +} |