Add an option to allow processes spawn with pipes

diff --git a/include/task.h b/include/task.h
index 76639d4..2239188 100644 (file)
--- a/include/task.h
+++ b/include/task.h
@@ -56,7 +56,8 @@ int connman_task_set_notify(struct connman_task *task, const char *member,
                        connman_task_notify_t function, void *user_data);
 
 int connman_task_run(struct connman_task *task,
-                       connman_task_exit_t function, void *user_data);
+                       connman_task_exit_t function, void *user_data,
+                       int *fd, int *standard_output, int *standard_error);
 int connman_task_stop(struct connman_task *task);
 
 #ifdef __cplusplus

diff --git a/plugins/dhclient.c b/plugins/dhclient.c
index fc42024..fa0a8c3 100644 (file)
--- a/plugins/dhclient.c
+++ b/plugins/dhclient.c
@@ -207,7 +207,8 @@ static int dhclient_request(struct connman_dhcp *dhcp)
        connman_task_set_notify(dhclient->task, "Notify",
                                                dhclient_notify, dhcp);
 
-       connman_task_run(dhclient->task, dhclient_died, dhclient);
+       connman_task_run(dhclient->task, dhclient_died, dhclient,
+                                               NULL, NULL, NULL);
 
        return 0;
 }

diff --git a/src/task.c b/src/task.c
index f5495d7..3997307 100644 (file)
--- a/src/task.c
+++ b/src/task.c
@@ -267,12 +267,15 @@ static void task_setup(gpointer user_data)
  * @task: task structure
  * @function: exit callback
  * @user_data: optional exit user data
+ * @fd: optional spawn with pipe
  *
  * Execute program specified by #task
  */
 int connman_task_run(struct connman_task *task,
-                       connman_task_exit_t function, void *user_data)
+                       connman_task_exit_t function, void *user_data,
+                       int *fd, int *standard_output, int *standard_error)
 {
+       gboolean result;
        GSpawnFlags flags = G_SPAWN_DO_NOT_REAP_CHILD |
                                                G_SPAWN_STDOUT_TO_DEV_NULL;
        char **argv, **envp;
@@ -282,6 +285,11 @@ int connman_task_run(struct connman_task *task,
        if (task->pid > 0)
                return -EALREADY;
 
+       if (standard_output == NULL)
+               flags |= G_SPAWN_STDOUT_TO_DEV_NULL;
+       if (standard_error == NULL)
+               flags |= G_SPAWN_STDERR_TO_DEV_NULL;
+
        task->exit_func = function;
        task->exit_data = user_data;
 
@@ -312,8 +320,12 @@ int connman_task_run(struct connman_task *task,
        argv = (char **) task->argv->pdata;
        envp = (char **) task->envp->pdata;
 
-       if (g_spawn_async(NULL, argv, envp, flags,
-                               task_setup, task, &task->pid, NULL) == FALSE) {
+       result = g_spawn_async_with_pipes(NULL, argv, envp,
+                                         G_SPAWN_DO_NOT_REAP_CHILD,
+                                         task_setup, task, &task->pid,
+                                         fd, standard_output,
+                                         standard_output, NULL);
+       if (result == FALSE) {
                connman_error("Failed to spawn %s", argv[0]);
                return -EIO;
        }