diff options
| author | Havoc Pennington <hp@redhat.com> | 2004-08-29 02:14:52 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2004-08-29 02:14:52 +0000 |
| commit | f14f2196cc129e4e17f993773d57000784958bcf (patch) | |
| tree | dfc99360e2adeed8706fb0c0790c67d0a845934f /dbus/dbus-spawn.c | |
| parent | 2091cdd4e1c58318ac75533e2ea4a92292e1783c (diff) | |
2004-08-28 Havoc Pennington <hp@redhat.com>
* dbus/dbus-userdb.c (_dbus_is_console_user): remove unused variable
More fixes from Steve Grubb
* dbus/dbus-sysdeps.c (_dbus_connect_tcp_socket): fix fd leak
(_dbus_listen_tcp_socket): fix fd leak
* dbus/dbus-spawn.c (read_pid, read_ints): move the "again:" for
EINTR to a bit lower in the code
Diffstat (limited to 'dbus/dbus-spawn.c')
| -rw-r--r-- | dbus/dbus-spawn.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c index a7008303..03947cce 100644 --- a/dbus/dbus-spawn.c +++ b/dbus/dbus-spawn.c @@ -72,13 +72,13 @@ read_ints (int fd, { size_t chunk; size_t to_read; - - again: to_read = sizeof (int) * n_ints_in_buf - bytes; if (to_read == 0) break; + + again: chunk = read (fd, ((char*)buf) + bytes, @@ -128,11 +128,12 @@ read_pid (int fd, size_t chunk; size_t to_read; - again: to_read = sizeof (pid_t) - bytes; if (to_read == 0) break; + + again: chunk = read (fd, ((char*)buf) + bytes, |