fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-05 06:40:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add error handling when polling (FDO Bug #12954)

Browse source 
2008-01-15  John (J5) Palmieri  <johnp@redhat.com>

	* patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>

	* dbus/dbus-spawn.c (babysit, babysitter_iteration): add error
	handling when polling (FDO Bug #12954)
This commit is contained in:
John (J5) Palmieri 2008-01-15 13:46:50 -05:00
parent f72bb380a6
commit a6a22beeae
2 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-01-15 John (J5) Palmieri <johnp@redhat.com>
* patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>
* dbus/dbus-spawn.c (babysit, babysitter_iteration): add error
handling when polling (FDO Bug #12954)
2008-01-15 John (J5) Palmieri <johnp@redhat.com>
* patch by Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>

23
dbus/dbus-spawn.c
View file

@ -552,10 +552,21 @@ babysitter_iteration (DBusBabysitter *sitter,
{
int ret;
ret = _dbus_poll (fds, i, 0);
do
{
ret = _dbus_poll (fds, i, 0);
}
while (ret < 0 && errno == EINTR);
if (ret == 0 && block)
ret = _dbus_poll (fds, i, -1);
{
do
{
ret = _dbus_poll (fds, i, -1);
}
while (ret < 0 && errno == EINTR);
}
if (ret > 0)
{
descriptors_ready = TRUE;
@ -1018,7 +1029,11 @@ babysit (pid_t grandchild_pid,
pfds[1].events = _DBUS_POLLIN;
pfds[1].revents = 0;
_dbus_poll (pfds, _DBUS_N_ELEMENTS (pfds), -1);
if (_dbus_poll (pfds, _DBUS_N_ELEMENTS (pfds), -1) < 0 && errno != EINTR)
{
_dbus_warn ("_dbus_poll() error: %s\n", strerror (errno));
exit (1);
}
if (pfds[0].revents != 0)
{