Merge pull request #318 from gportay/fix-invalid-cpu-placeholder

print_cpu_usage: fix invalid %cpu placeholder output

diff --git a/src/print_cpu_usage.c b/src/print_cpu_usage.c
index 1fccba41abe0a3d74cb54000a54a06bdc907138b..411d5f4ca7c3325eccca57f21c63cb9348fa4b6a 100644 (file)
--- 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 (file)
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 (file)
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"
+}