1 files changed, 14 insertions, 16 deletions

diff --git a/src/collectors/cgroups.plugin/cgroup-network.c b/src/collectors/cgroups.plugin/cgroup-network.c
index 685282e89..4cb5cbabe 100644
--- a/src/collectors/cgroups.plugin/cgroup-network.c
+++ b/src/collectors/cgroups.plugin/cgroup-network.c
@@ -421,19 +421,19 @@ void detect_veth_interfaces(pid_t pid) {
 
     host = read_proc_net_dev("host", netdata_configured_host_prefix);
     if(!host) {
-        errno = 0;
+        errno_clear();
         collector_error("cannot read host interface list.");
         goto cleanup;
     }
 
     if(!eligible_ifaces(host)) {
-        errno = 0;
+        errno_clear();
         collector_info("there are no double-linked host interfaces available.");
         goto cleanup;
     }
 
     if(switch_namespace(netdata_configured_host_prefix, pid)) {
-        errno = 0;
+        errno_clear();
         collector_error("cannot switch to the namespace of pid %u", (unsigned int) pid);
         goto cleanup;
     }
@@ -444,13 +444,13 @@ void detect_veth_interfaces(pid_t pid) {
 
     cgroup = read_proc_net_dev("cgroup", NULL);
     if(!cgroup) {
-        errno = 0;
+        errno_clear();
         collector_error("cannot read cgroup interface list.");
         goto cleanup;
     }
 
     if(!eligible_ifaces(cgroup)) {
-        errno = 0;
+        errno_clear();
         collector_error("there are not double-linked cgroup interfaces available.");
         goto cleanup;
     }
@@ -505,22 +505,20 @@ void call_the_helper(pid_t pid, const char *cgroup) {
 
     collector_info("running: %s", command);
 
-    pid_t cgroup_pid;
-    FILE *fp_child_input, *fp_child_output;
+    POPEN_INSTANCE *pi;
 
-    if(cgroup) {
-        (void)netdata_popen_raw_default_flags(&cgroup_pid, environment, &fp_child_input, &fp_child_output, PLUGINS_DIR "/cgroup-network-helper.sh", "--cgroup", cgroup);
-    }
+    if(cgroup)
+        pi = spawn_popen_run_variadic(PLUGINS_DIR "/cgroup-network-helper.sh", "--cgroup", cgroup, NULL);
     else {
         char buffer[100];
         snprintfz(buffer, sizeof(buffer) - 1, "%d", pid);
-        (void)netdata_popen_raw_default_flags(&cgroup_pid, environment, &fp_child_input, &fp_child_output, PLUGINS_DIR "/cgroup-network-helper.sh", "--pid", buffer);
+        pi = spawn_popen_run_variadic(PLUGINS_DIR "/cgroup-network-helper.sh", "--pid", buffer, NULL);
     }
 
-    if(fp_child_output) {
+    if(pi) {
         char buffer[CGROUP_NETWORK_INTERFACE_MAX_LINE + 1];
         char *s;
-        while((s = fgets(buffer, CGROUP_NETWORK_INTERFACE_MAX_LINE, fp_child_output))) {
+        while((s = fgets(buffer, CGROUP_NETWORK_INTERFACE_MAX_LINE, pi->child_stdout_fp))) {
             trim(s);
 
             if(*s && *s != '\n') {
@@ -536,7 +534,7 @@ void call_the_helper(pid_t pid, const char *cgroup) {
             }
         }
 
-        netdata_pclose(fp_child_input, fp_child_output, cgroup_pid);
+        spawn_popen_kill(pi);
     }
     else
         collector_error("cannot execute cgroup-network helper script: %s", command);
@@ -701,7 +699,7 @@ int main(int argc, char **argv) {
         pid = atoi(argv[arg+1]);
 
         if(pid <= 0) {
-            errno = 0;
+            errno_clear();
             collector_error("Invalid pid %d given", (int) pid);
             return 2;
         }
@@ -719,7 +717,7 @@ int main(int argc, char **argv) {
         if(helper) call_the_helper(pid, cgroup);
 
         if(pid <= 0 && !detected_devices) {
-            errno = 0;
+            errno_clear();
             collector_error("Cannot find a cgroup PID from cgroup '%s'", cgroup);
         }
     }