Merging upstream version 1.47.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 8 insertions, 13 deletions

diff --git a/src/claim/claim.c b/src/claim/claim.c
index 5f4ec9a43..5383aac37 100644
--- a/src/claim/claim.c
+++ b/src/claim/claim.c
@@ -53,11 +53,8 @@ CLAIM_AGENT_RESPONSE claim_agent(const char *claiming_arguments, bool force, con
     }
 
 #ifndef DISABLE_CLOUD
-    int exit_code;
-    pid_t command_pid;
     char command_exec_buffer[CLAIMING_COMMAND_LENGTH + 1];
     char command_line_buffer[CLAIMING_COMMAND_LENGTH + 1];
-    FILE *fp_child_output, *fp_child_input;
 
     // This is guaranteed to be set early in main via post_conf_load()
     char *cloud_base_url = appconfig_get(&cloud_config, CONFIG_SECTION_GLOBAL, "cloud base url", NULL);
@@ -92,17 +89,17 @@ CLAIM_AGENT_RESPONSE claim_agent(const char *claiming_arguments, bool force, con
               claiming_arguments);
 
     netdata_log_info("Executing agent claiming command: %s", command_exec_buffer);
-    fp_child_output = netdata_popen(command_line_buffer, &command_pid, &fp_child_input);
-    if(!fp_child_output) {
+    POPEN_INSTANCE *instance = spawn_popen_run(command_line_buffer);
+    if(!instance) {
         netdata_log_error("Cannot popen(\"%s\").", command_exec_buffer);
         return CLAIM_AGENT_CANNOT_EXECUTE_CLAIM_SCRIPT;
     }
 
     netdata_log_info("Waiting for claiming command '%s' to finish.", command_exec_buffer);
     char read_buffer[100 + 1];
-    while (fgets(read_buffer, 100, fp_child_output) != NULL) ;
+    while (fgets(read_buffer, 100, instance->child_stdout_fp) != NULL) ;
 
-    exit_code = netdata_pclose(fp_child_input, fp_child_output, command_pid);
+    int exit_code = spawn_popen_wait(instance);
 
     netdata_log_info("Agent claiming command '%s' returned with code %d", command_exec_buffer, exit_code);
     if (0 == exit_code) {
@@ -113,7 +110,7 @@ CLAIM_AGENT_RESPONSE claim_agent(const char *claiming_arguments, bool force, con
         netdata_log_error("Agent claiming command '%s' failed to complete its run", command_exec_buffer);
         return CLAIM_AGENT_CLAIM_SCRIPT_FAILED;
     }
-    errno = 0;
+    errno_clear();
     unsigned maximum_known_exit_code = sizeof(claiming_errors) / sizeof(claiming_errors[0]) - 1;
 
     if ((unsigned)exit_code > maximum_known_exit_code) {
@@ -121,10 +118,8 @@ CLAIM_AGENT_RESPONSE claim_agent(const char *claiming_arguments, bool force, con
         return CLAIM_AGENT_CLAIM_SCRIPT_RETURNED_INVALID_CODE;
     }
 
-    netdata_log_error("Agent failed to be claimed using the command '%s' with the following error message:",
-                      command_exec_buffer);
-
-    netdata_log_error("\"%s\"", claiming_errors[exit_code]);
+    netdata_log_error("Agent failed to be claimed using the command '%s' with the following error message: %s",
+                      command_exec_buffer, claiming_errors[exit_code]);
 
     if(msg) *msg = claiming_errors[exit_code];
 
@@ -214,7 +209,7 @@ void load_cloud_conf(int silent)
         netdata_cloud_enabled = CONFIG_BOOLEAN_NO;
 
     char *filename;
-    errno = 0;
+    errno_clear();
 
     int ret = 0;