ObjFW  Diff

Differences From Artifact [f8648491b3]:

To Artifact [7c915a3b62]:


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
85
86
87
88
89
90
91
92

93
94
95

96
97
98


99
100

101
102
103
104


105
106

107
108
109
110
111
112

113
114
115
116
117

118
119
120
121
122
123
124
125
126
127

128
129
130

131
132

133
134
135
136
137
138
139
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
85
86
87
88
89
90
91

92
93
94

95
96


97
98
99

100
101
102


103
104
105

106
107
108
109
110
111

112
113
114
115
116

117
118
119
120
121
122
123
124
125
126

127
128
129

130
131

132
133
134
135
136
137
138
139







-
+


-
-
+
+

-
+





-
+




-
+









-
+


-
+

-
-
+
+

-
+


-
-
+
+

-
+





-
+




-
+









-
+


-
+

-
+







+ socket
{
	return [[[self alloc] init] autorelease];
}

- (BOOL)_isAtEndOfStream
{
	return eos;
	return isAtEndOfStream;
}

- (size_t)_readNBytes: (size_t)size
	   intoBuffer: (char*)buf
- (size_t)_readNBytes: (size_t)length
	   intoBuffer: (char*)buffer
{
	ssize_t ret;
	ssize_t retLength;

	if (sock == INVALID_SOCKET)
		@throw [OFNotConnectedException newWithClass: isa
						      socket: self];

	if (eos) {
	if (isAtEndOfStream) {
		OFReadFailedException *e;

		e = [OFReadFailedException newWithClass: isa
						 stream: self
					  requestedSize: size];
					requestedLength: length];
#ifndef _WIN32
		e->errNo = ENOTCONN;
#else
		e->errNo = WSAENOTCONN;
#endif

		@throw e;
	}

	if ((ret = recv(sock, buf, size, 0)) < 0)
	if ((retLength = recv(sock, buffer, length, 0)) < 0)
		@throw [OFReadFailedException newWithClass: isa
						    stream: self
					     requestedSize: size];
					   requestedLength: length];

	if (ret == 0)
		eos = YES;
	if (retLength == 0)
		isAtEndOfStream = YES;

	return ret;
	return retLength;
}

- (size_t)_writeNBytes: (size_t)size
	    fromBuffer: (const char*)buf
- (size_t)_writeNBytes: (size_t)length
	    fromBuffer: (const char*)buffer
{
	ssize_t ret;
	ssize_t retLength;

	if (sock == INVALID_SOCKET)
		@throw [OFNotConnectedException newWithClass: isa
						      socket: self];

	if (eos) {
	if (isAtEndOfStream) {
		OFWriteFailedException *e;

		e = [OFWriteFailedException newWithClass: isa
						  stream: self
					   requestedSize: size];
					 requestedLength: length];
#ifndef _WIN32
		e->errNo = ENOTCONN;
#else
		e->errNo = WSAENOTCONN;
#endif

		@throw e;
	}

	if ((ret = send(sock, buf, size, 0)) == -1)
	if ((retLength = send(sock, buffer, length, 0)) == -1)
		@throw [OFWriteFailedException newWithClass: isa
						     stream: self
					      requestedSize: size];
					    requestedLength: length];

	return ret;
	return retLength;
}

#ifdef _WIN32
- (void)setBlocking: (BOOL)enable
{
	u_long v = enable;
	isBlocking = enable;
154
155
156
157
158
159
160
161

162
163
164
165
166
167
168
169
170
171
154
155
156
157
158
159
160

161
162
163
164
165
166
167
168
169
170
171







-
+










	if (sock == INVALID_SOCKET)
		@throw [OFNotConnectedException newWithClass: isa
						      socket: self];

	close(sock);

	sock = INVALID_SOCKET;
	eos = NO;
	isAtEndOfStream = NO;
}

- (void)dealloc
{
	if (sock != INVALID_SOCKET)
		[self close];

	[super dealloc];
}
@end