Merge branch 'collectd-5.7' into collectd-5.8

[collectd.git] / contrib / docker / rootfs_prefix / rootfs_prefix.c

diff --git a/contrib/docker/rootfs_prefix/rootfs_prefix.c b/contrib/docker/rootfs_prefix/rootfs_prefix.c
index c27a67a..2b83151 100644 (file)
--- a/contrib/docker/rootfs_prefix/rootfs_prefix.c
+++ b/contrib/docker/rootfs_prefix/rootfs_prefix.c
@@ -11,28 +11,22 @@
 #define BUFSIZE 256
 
 const char *add_prefix(const char *orig, char *prefixed) {
-  int status;
-  int errno;
-
-  if ((strncmp(orig, "/proc", 5) == 0) || (strncmp(orig, "/sys", 4) == 0)) {
-
-    status = snprintf(prefixed, BUFSIZE, "%s%s", PREFIX, orig);
-    if ((unsigned int)status >= BUFSIZE) {
-      error(status, ENAMETOOLONG,
-            "'%s' got truncated when adding '%s' prefix: '%s'", orig, PREFIX,
-            prefixed);
-      return orig;
-    } else if (status < 1) {
-      error(status, errno,
-            "adding '%s' prefix to file path failed: '%s' -> '%s'", PREFIX,
-            orig, prefixed);
-      return orig;
-    } else {
-      return (const char *)prefixed;
-    }
+  if ((strncmp(orig, "/proc", strlen("/proc")) != 0) &&
+      (strncmp(orig, "/sys", strlen("/sys")) != 0))
+    return orig;
 
-  } else {
+  int status = snprintf(prefixed, BUFSIZE, "%s%s", PREFIX, orig);
+  if (status < 1) {
+    error(status, errno, "adding '%s' prefix to file path failed: '%s' -> '%s'",
+          PREFIX, orig, prefixed);
+    return orig;
+  } else if ((unsigned int)status >= BUFSIZE) {
+    error(status, ENAMETOOLONG,
+          "'%s' got truncated when adding '%s' prefix: '%s'", orig, PREFIX,
+          prefixed);
     return orig;
+  } else {
+    return (const char *)prefixed;
   }
 }