Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

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

1 files changed, 6 insertions, 9 deletions

diff --git a/src/libnetdata/spawn_server/spawn_server.h b/src/libnetdata/spawn_server/spawn_server.h
index 5ba66ae38..e68a53ab4 100644
--- a/src/libnetdata/spawn_server/spawn_server.h
+++ b/src/libnetdata/spawn_server/spawn_server.h
@@ -7,16 +7,12 @@
 
 typedef enum __attribute__((packed)) {
     SPAWN_INSTANCE_TYPE_EXEC = 0,
-#if !defined(OS_WINDOWS)
     SPAWN_INSTANCE_TYPE_CALLBACK = 1
-#endif
 } SPAWN_INSTANCE_TYPE;
 
 typedef enum __attribute__((packed)) {
     SPAWN_SERVER_OPTION_EXEC = (1 << 0),
-#if !defined(OS_WINDOWS)
     SPAWN_SERVER_OPTION_CALLBACK = (1 << 1),
-#endif
 } SPAWN_SERVER_OPTIONS;
 
 // this is only used publicly for SPAWN_INSTANCE_TYPE_CALLBACK
@@ -27,7 +23,7 @@ typedef struct spawn_request {
     pid_t pid;                          // the pid of the child
     int sock;                           // the socket for this request
     int fds[SPAWN_SERVER_TRANSFER_FDS]; // 0 = stdin, 1 = stdout, 2 = stderr, 3 = custom
-    const char **environment;           // the environment of the parent process
+    const char **envp;                  // the environment of the parent process
     const char **argv;                  // the command line and its parameters
     const void *data;                   // the data structure for the callback
     size_t data_size;                   // the data structure size
@@ -36,17 +32,18 @@ typedef struct spawn_request {
     struct spawn_request *prev, *next;  // linking of active requests at the spawn server
 } SPAWN_REQUEST;
 
-typedef void (*spawn_request_callback_t)(SPAWN_REQUEST *request);
+typedef int (*spawn_request_callback_t)(SPAWN_REQUEST *request);
 
-typedef struct spawm_instance SPAWN_INSTANCE;
+typedef struct spawn_instance SPAWN_INSTANCE;
 typedef struct spawn_server SPAWN_SERVER;
 
 SPAWN_SERVER* spawn_server_create(SPAWN_SERVER_OPTIONS options, const char *name, spawn_request_callback_t child_callback, int argc, const char **argv);
 void spawn_server_destroy(SPAWN_SERVER *server);
+pid_t spawn_server_pid(SPAWN_SERVER *server);
 
 SPAWN_INSTANCE* spawn_server_exec(SPAWN_SERVER *server, int stderr_fd, int custom_fd, const char **argv, const void *data, size_t data_size, SPAWN_INSTANCE_TYPE type);
-int spawn_server_exec_kill(SPAWN_SERVER *server, SPAWN_INSTANCE *instance);
-int spawn_server_exec_wait(SPAWN_SERVER *server, SPAWN_INSTANCE *instance);
+int spawn_server_exec_kill(SPAWN_SERVER *server, SPAWN_INSTANCE *si);
+int spawn_server_exec_wait(SPAWN_SERVER *server, SPAWN_INSTANCE *si);
 
 int spawn_server_instance_read_fd(SPAWN_INSTANCE *si);
 int spawn_server_instance_write_fd(SPAWN_INSTANCE *si);