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 | |
| parent | 7f3af4748f8deff75fce6dd50d0005aadfd4985c (diff) | |
| download | dbus-329f99a197819ac3978c409b1b9f4ef68297a825.tar.gz | |
* 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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | dbus/dbus-spawn.c | 10 | ||||
| -rw-r--r-- | dbus/dbus-spawn.h | 1 | ||||
| -rw-r--r-- | test/spawn-test.c | 2 |
4 files changed, 15 insertions, 5 deletions
@@ -1,5 +1,12 @@ 2007-03-04 Ralf Habacker <ralf.habacker@freenet.de> + * 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. + +2007-03-04 Ralf Habacker <ralf.habacker@freenet.de> + * configure.in,test/test-sleep-forever.c,test/test-names.c: added configure check for unistd.h. 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); diff --git a/dbus/dbus-spawn.h b/dbus/dbus-spawn.h index 750dbb34..77b3b12d 100644 --- a/dbus/dbus-spawn.h +++ b/dbus/dbus-spawn.h @@ -37,6 +37,7 @@ typedef struct DBusBabysitter DBusBabysitter; dbus_bool_t _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p, char **argv, + char **env, DBusSpawnChildSetupFunc child_setup, void *user_data, DBusError *error); diff --git a/test/spawn-test.c b/test/spawn-test.c index f323368f..991a5e83 100644 --- a/test/spawn-test.c +++ b/test/spawn-test.c @@ -31,7 +31,7 @@ main (int argc, char **argv) argv_copy [i] = argv[i + 1]; argv_copy[argc - 1] = NULL; - if (!_dbus_spawn_async_with_babysitter (NULL, argv_copy, setup_func, NULL, &error)) + if (!_dbus_spawn_async_with_babysitter (NULL, argv_copy, NULL, setup_func, NULL, &error)) { fprintf (stderr, "Could not launch application: \"%s\"\n", error.message); |