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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
--- io.c.orig Sun Jan 2 19:55:12 2000
+++ io.c Mon May 29 20:40:30 2000
@@ -135,14 +135,17 @@
fd_set readfd;
struct timeval tv;
- FD_ZERO(&readfd);
-
- FD_SET(fd,&readfd);
-
- tv.tv_sec=tv.tv_usec=0;
-
- if(select(fd+1,&readfd,NULL,NULL,&tv)<=0)
- return(nr);
+ while(1)
+ {
+ tv.tv_sec=tv.tv_usec=0;
+ FD_ZERO(&readfd);
+ FD_SET(fd,&readfd);
+ n=select(fd+1,&readfd,NULL,NULL,&tv);
+ if(n>0)
+ break;
+ if(n==0 || errno!=EINTR)
+ return(nr);
+ }
n=read(fd,fdbuf[fd],BUFSIZE);
@@ -206,15 +209,18 @@
fd_set readfd;
struct timeval tv;
- FD_ZERO(&readfd);
-
- FD_SET(fd,&readfd);
-
- tv.tv_sec=timeout;
- tv.tv_usec=0;
-
- if(select(fd+1,&readfd,NULL,NULL,&tv)<=0)
- return(-1);
+ while(1)
+ {
+ tv.tv_sec=timeout;
+ tv.tv_usec=0;
+ FD_ZERO(&readfd);
+ FD_SET(fd,&readfd);
+ nr=select(fd+1,&readfd,NULL,NULL,&tv);
+ if(nr>0)
+ break;
+ if(nr==0 || errno!=EINTR)
+ return(-1);
+ }
nr=read(fd,buffer,n);
}
@@ -364,15 +370,18 @@
fd_set readfd;
struct timeval tv;
- FD_ZERO(&readfd);
-
- FD_SET(fd,&readfd);
-
- tv.tv_sec=timeout;
- tv.tv_usec=0;
-
- if(select(fd+1,&readfd,NULL,NULL,&tv)<=0)
- return(-1);
+ while(1)
+ {
+ tv.tv_sec=timeout;
+ tv.tv_usec=0;
+ FD_ZERO(&readfd);
+ FD_SET(fd,&readfd);
+ n=select(fd+1,&readfd,NULL,NULL,&tv);
+ if(n>0)
+ break;
+ if(n==0 || errno!=EINTR)
+ return(-1);
+ }
n=read(fd,fdbuf[fd]+fdbytes[fd],BUFSIZE-fdbytes[fd]);
fdbytes[fd]+=n;
|
