projects
/
platform
/
upstream
/
dbus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Foxp][Test] simple echo test with custom payload size
[platform/upstream/dbus.git]
/
dbus
/
dbus-spawn.c
diff --git
a/dbus/dbus-spawn.c
b/dbus/dbus-spawn.c
index
ef00801
..
f8d5fd1
100644
(file)
--- a/
dbus/dbus-spawn.c
+++ b/
dbus/dbus-spawn.c
@@
-936,7
+936,7
@@
do_exec (int child_err_report_fd,
DBusSpawnChildSetupFunc child_setup,
void *user_data)
{
DBusSpawnChildSetupFunc child_setup,
void *user_data)
{
-#ifdef DBUS_
BUIL
D_TESTS
+#ifdef DBUS_
ENABLE_EMBEDDE
D_TESTS
int i, max_open;
#endif
int i, max_open;
#endif
@@
-947,7
+947,7
@@
do_exec (int child_err_report_fd,
if (child_setup)
(* child_setup) (user_data);
if (child_setup)
(* child_setup) (user_data);
-#ifdef DBUS_
BUIL
D_TESTS
+#ifdef DBUS_
ENABLE_EMBEDDE
D_TESTS
max_open = sysconf (_SC_OPEN_MAX);
for (i = 3; i < max_open; i++)
max_open = sysconf (_SC_OPEN_MAX);
for (i = 3; i < max_open; i++)
@@
-1256,7
+1256,11
@@
_dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p,
_dbus_assert_not_reached ("Got to code after write_err_and_exit()");
}
else if (grandchild_pid == 0)
_dbus_assert_not_reached ("Got to code after write_err_and_exit()");
}
else if (grandchild_pid == 0)
- {
+ {
+ /* Go back to ignoring SIGPIPE, since it's evil
+ */
+ signal (SIGPIPE, SIG_IGN);
+
do_exec (child_err_report_pipe[WRITE_END],
argv,
env,
do_exec (child_err_report_pipe[WRITE_END],
argv,
env,
@@
-1321,7
+1325,7
@@
_dbus_babysitter_set_result_function (DBusBabysitter *sitter,
/** @} */
/** @} */
-#ifdef DBUS_
BUIL
D_TESTS
+#ifdef DBUS_
ENABLE_EMBEDDE
D_TESTS
static char *
get_test_exec (const char *exe,
static char *
get_test_exec (const char *exe,