From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 7 Nov 2019 20:00:40 +0000 (+0100)
Subject: Merge pull request #3340 from ryan-mccabe/pr2365-turbostat-parsing
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=f35937bd13e42ba22632c439903b11a31588020c;hp=a146d7560a895231f30eaa68f71a4d3f588adf51;p=collectd.git

Merge pull request #3340 from ryan-mccabe/pr2365-turbostat-parsing

turbostat: Fix parsing warnings
---

diff --git a/src/turbostat.c b/src/turbostat.c
index 19a51115..8bbb92b5 100644
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -1103,7 +1103,11 @@ static int __attribute__((format(printf, 1, 2)))
 parse_int_file(const char *fmt, ...) {
   va_list args;
   char path[PATH_MAX];
+  char buf[256];
   int len;
+  value_t v;
+  char *c;
+  FILE *fp;
 
   va_start(args, fmt);
   len = vsnprintf(path, sizeof(path), fmt, args);
@@ -1113,8 +1117,29 @@ parse_int_file(const char *fmt, ...) {
     return -1;
   }
 
-  value_t v;
-  if (parse_value_file(path, &v, DS_TYPE_DERIVE) != 0) {
+  fp = fopen(path, "r");
+  if (fp == NULL) {
+    ERROR("turbostat plugin: unable to open: '%s': %s", path, strerror(errno));
+    return -1;
+  }
+
+  if (fgets(buf, sizeof(buf), fp) == NULL) {
+    ERROR("turbostat plugin: unable to read: '%s': %s", path, strerror(errno));
+    fclose(fp);
+    return -1;
+  }
+  fclose(fp);
+
+  /* We only care about the first integer in the range */
+  c = strchr(buf, '-');
+  if (c != NULL)
+    *c = '\0';
+  c = strchr(buf, ',');
+  if (c != NULL)
+    *c = '\0';
+  strstripnewline(buf);
+
+  if (parse_value(buf, &v, DS_TYPE_DERIVE) != 0) {
     ERROR("turbostat plugin: Parsing \"%s\" failed.", path);
     return -1;
   }