diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2007-03-04 19:14:04 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2007-03-04 19:14:04 +0000 |
| commit | 329f99a197819ac3978c409b1b9f4ef68297a825 (patch) | |
| tree | 192f53f7b583c5ff5d6f21ce6ffbf07f1006b139 /dbus/dbus-spawn.c | |
| parent | 7f3af4748f8deff75fce6dd50d0005aadfd4985c (diff) | |
* dbus/dbus-spawn.c,dbus/dbus-spawn.h (_dbus_spawn_async_with_babysitter):
added environment pointer as function parameter,used on win32.
* test/spawn-test.c: fixed call to above mentioned function.
Diffstat (limited to 'dbus/dbus-spawn.c')
| -rw-r--r-- | dbus/dbus-spawn.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c index b0a4fa2b..07535db9 100644 --- a/dbus/dbus-spawn.c +++ b/dbus/dbus-spawn.c @@ -1021,6 +1021,7 @@ babysit (pid_t grandchild_pid, * * @param sitter_p return location for babysitter or #NULL * @param argv the executable and arguments + * @param env the environment (not used on unix yet) * @param child_setup function to call in child pre-exec() * @param user_data user data for setup function * @param error error object to be filled in if function fails @@ -1029,6 +1030,7 @@ babysit (pid_t grandchild_pid, dbus_bool_t _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p, char **argv, + char **env, DBusSpawnChildSetupFunc child_setup, void *user_data, DBusError *error) @@ -1217,7 +1219,7 @@ check_spawn_nonexistent (void *data) argv[0] = "/this/does/not/exist/32542sdgafgafdg"; if (_dbus_spawn_async_with_babysitter (&sitter, argv, - NULL, NULL, + NULL, NULL, NULL, &error)) { _dbus_babysitter_block_for_child_exit (sitter); @@ -1262,7 +1264,7 @@ check_spawn_segfault (void *data) argv[0] = TEST_SEGFAULT_BINARY; if (_dbus_spawn_async_with_babysitter (&sitter, argv, - NULL, NULL, + NULL, NULL, NULL, &error)) { _dbus_babysitter_block_for_child_exit (sitter); @@ -1307,7 +1309,7 @@ check_spawn_exit (void *data) argv[0] = TEST_EXIT_BINARY; if (_dbus_spawn_async_with_babysitter (&sitter, argv, - NULL, NULL, + NULL, NULL, NULL, &error)) { _dbus_babysitter_block_for_child_exit (sitter); @@ -1352,7 +1354,7 @@ check_spawn_and_kill (void *data) argv[0] = TEST_SLEEP_FOREVER_BINARY; if (_dbus_spawn_async_with_babysitter (&sitter, argv, - NULL, NULL, + NULL, NULL, NULL, &error)) { _dbus_babysitter_kill_child (sitter); |