1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
$NetBSD: patch-bc,v 1.1 2007/09/20 21:12:13 wiz Exp $
From FreeBSD's GNOME development repository.
--- src/daemon/io.c.orig 2005-12-12 11:09:38.000000000 +0100
+++ src/daemon/io.c
@@ -22,6 +22,7 @@
*/
#include <config.h>
+#include <errno.h>
#include "daemon.h"
#include <glibtop/error.h>
@@ -37,9 +38,13 @@ do_output (int s, glibtop_response *resp
resp->offset = offset;
resp->data_size = data_size;
+retry1:
if (s == 0) {
- if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0)
+ if (write (1, (const void *) resp, sizeof (glibtop_response)) < 0) {
+ if (errno == EINTR)
+ goto retry1;
glibtop_warn_io ("write");
+ }
} else {
if (send (s, (const void *) resp, sizeof (glibtop_response), 0) < 0)
glibtop_warn_io ("send");
@@ -50,9 +55,13 @@ do_output (int s, glibtop_response *resp
fprintf (stderr, "Writing %d bytes of data.\n", resp->data_size);
#endif
+retry2:
if (s == 0) {
- if (write (1, data, resp->data_size) < 0)
+ if (write (1, data, resp->data_size) < 0) {
+ if (errno == EINTR)
+ goto retry2;
glibtop_warn_io ("write");
+ }
} else {
if (send (s, data, resp->data_size, 0) , 0)
glibtop_warn_io ("send");
@@ -68,6 +77,7 @@ do_read (int s, void *ptr, size_t total_
size_t already_read = 0, remaining = total_size;
while (already_read < total_size) {
+retry:
if (s)
nread = recv (s, ptr, remaining, 0);
else
@@ -79,6 +89,8 @@ do_read (int s, void *ptr, size_t total_
}
if (nread <= 0) {
+ if (errno == EINTR)
+ goto retry;
glibtop_warn_io ("recv");
return 0;
}
|
