ObjFW  Diff

Differences From Artifact [585894669b]:

To Artifact [49caf92ef8]:


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


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
140
141
142
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
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
140
141
142







-
+











-
-
+
+





-
-
+
+













-
-
+
+


-
-
+
+

-
-
-
+
+
+



-
+



-
-
+
+

-
+



-
+

-
+



-
-
+
+

-
+

-
-
-
+
+
+







		@throw [OFNotImplementedException newWithClass: c
						      selector: _cmd];
	}

	self = [super init];

	cache = NULL;
	wBuffer = NULL;
	writeBuffer = NULL;
	isBlocking = YES;

	return self;
}

- (BOOL)_isAtEndOfStream
{
	@throw [OFNotImplementedException newWithClass: isa
					      selector: _cmd];
}

- (size_t)_readNBytes: (size_t)size
	   intoBuffer: (char*)buf
- (size_t)_readNBytes: (size_t)length
	   intoBuffer: (char*)buffer
{
	@throw [OFNotImplementedException newWithClass: isa
					      selector: _cmd];
}

- (size_t)_writeNBytes: (size_t)size
	    fromBuffer: (const char*)buf
- (size_t)_writeNBytes: (size_t)length
	    fromBuffer: (const char*)buffer
{
	@throw [OFNotImplementedException newWithClass: isa
					      selector: _cmd];
}

- (BOOL)isAtEndOfStream
{
	if (cache != NULL)
		return NO;

	return [self _isAtEndOfStream];
}

- (size_t)readNBytes: (size_t)size
	  intoBuffer: (char*)buf
- (size_t)readNBytes: (size_t)length
	  intoBuffer: (char*)buffer
{
	if (cache == NULL)
		return [self _readNBytes: size
			      intoBuffer: buf];
		return [self _readNBytes: length
			      intoBuffer: buffer];

	if (size >= cacheLen) {
		size_t ret = cacheLen;
		memcpy(buf, cache, cacheLen);
	if (length >= cacheLength) {
		size_t ret = cacheLength;
		memcpy(buffer, cache, cacheLength);

		[self freeMemory: cache];
		cache = NULL;
		cacheLen = 0;
		cacheLength = 0;

		return ret;
	} else {
		char *tmp = [self allocMemoryWithSize: cacheLen - size];
		memcpy(tmp, cache + size, cacheLen - size);
		char *tmp = [self allocMemoryWithSize: cacheLength - length];
		memcpy(tmp, cache + length, cacheLength - length);

		memcpy(buf, cache, size);
		memcpy(buffer, cache, length);

		[self freeMemory: cache];
		cache = tmp;
		cacheLen -= size;
		cacheLength -= length;

		return size;
		return length;
	}
}

- (void)readExactlyNBytes: (size_t)size
	       intoBuffer: (char*)buf
- (void)readExactlyNBytes: (size_t)length
	       intoBuffer: (char*)buffer
{
	size_t len = 0;
	size_t readLength = 0;

	while (len < size)
		len += [self readNBytes: size - len
			     intoBuffer: buf + len];
	while (readLength < length)
		readLength += [self readNBytes: length - readLength
				    intoBuffer: buffer + readLength];
}

- (uint8_t)readInt8
{
	uint8_t ret;

	[self readExactlyNBytes: 1
201
202
203
204
205
206
207
208
209


210
211
212
213
214
215
216



217
218
219

220
221
222

223
224
225
226
227
228
229
230
231
232
233
234


235
236
237


238
239
240
241

242
243
244
245
246




247
248
249

250
251
252

253
254
255
256
257
258
259
260
261
262
263


264
265
266
267
268

269
270
271

272
273
274

275
276
277
278

279

280

281
282
283
284



285
286
287
288


289
290
291
292
293
294
295
296

297
298
299
300
301
302
303
304

305

306
307


308
309
310
311

312
313
314
315

316
317
318
319
320
321


322
323
324
325
326
327
328
329






330
331
332
333




334
335
336
337



338
339



340
341

342
343

344
345
346
347
348
349
350
351
352
353


354
355
356
357



358
359

360
361
362
363

364
365
366
367
368
369
370





371
372
373
374


375
376
377
378
379
380
381
382

383
384
385
386
387
388
389


390
391

392
393
394

395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412



413
414
415
416
417


418
419
420

421
422
423
424
425
426
427


428
429
430

431
432

433
434
435
436




437
438
439
440
441
442
443





444
445
446
447


448
449
450
451
452
453
454
455

456
457
458
459
460
461
462
463
464
465

466
467
468
469

470
471
472
473
474
475


476
477
478
479


480
481
482
483
484



485
486
487
488




489
490


491

492
493
494
495
496
497






498
499



500
501

502
503

504
505

506
507
508
509
510
511
512





513
514
515
516


517
518
519
520
521
522
523
524

525
526
527
528
529
530
531


532
533

534
535
536

537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555

556
557
558
559


560
561
562
563



564
565
566
567


568
569
570
571


572
573
574
575
576




577
578

579
580
581
582
583
584
585
201
202
203
204
205
206
207


208
209
210
211
212
213



214
215
216
217
218

219
220
221

222
223
224
225
226
227
228
229
230
231
232


233
234
235


236
237
238
239
240

241
242




243
244
245
246
247
248

249
250
251

252
253
254
255
256
257
258
259
260
261


262
263
264
265
266
267

268
269
270

271
272
273

274
275
276
277

278
279
280

281




282
283
284
285
286


287
288
289
290
291
292
293
294
295

296
297
298
299
300
301
302
303

304
305
306


307
308
309
310
311

312
313
314
315

316
317
318
319
320


321
322
323
324






325
326
327
328
329
330
331
332


333
334
335
336
337



338
339
340
341
342
343
344
345
346

347
348

349
350
351
352
353
354
355
356
357


358
359
360
361


362
363
364
365

366
367
368
369

370
371
372





373
374
375
376
377
378
379


380
381
382
383
384
385
386
387
388

389
390
391
392
393
394
395

396
397
398

399
400
401

402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417



418
419
420
421
422
423


424
425
426
427

428
429
430
431
432
433


434
435
436
437

438
439

440
441



442
443
444
445

446





447
448
449
450
451
452
453


454
455
456
457
458
459
460
461
462

463
464
465
466
467
468
469
470
471
472

473
474
475
476

477
478
479
480
481


482
483
484
485


486
487
488
489



490
491
492
493



494
495
496
497
498
499
500
501

502

503




504
505
506
507
508
509
510
511
512
513
514
515

516
517

518
519

520
521
522





523
524
525
526
527
528
529


530
531
532
533
534
535
536
537
538

539
540
541
542
543
544
545

546
547
548

549
550
551

552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570

571
572
573


574
575
576



577
578
579
580
581


582
583
584
585


586
587
588




589
590
591
592
593

594
595
596
597
598
599
600
601







-
-
+
+




-
-
-
+
+
+


-
+


-
+










-
-
+
+

-
-
+
+



-
+

-
-
-
-
+
+
+
+


-
+


-
+









-
-
+
+




-
+


-
+


-
+



-
+

+
-
+
-
-
-
-
+
+
+


-
-
+
+







-
+







-
+

+
-
-
+
+



-
+



-
+




-
-
+
+


-
-
-
-
-
-
+
+
+
+
+
+


-
-
+
+
+
+

-
-
-
+
+
+


+
+
+

-
+

-
+








-
-
+
+


-
-
+
+
+

-
+



-
+


-
-
-
-
-
+
+
+
+
+


-
-
+
+







-
+






-
+
+

-
+


-
+















-
-
-
+
+
+



-
-
+
+


-
+





-
-
+
+


-
+

-
+

-
-
-
+
+
+
+
-

-
-
-
-
-
+
+
+
+
+


-
-
+
+







-
+









-
+



-
+




-
-
+
+


-
-
+
+


-
-
-
+
+
+

-
-
-
+
+
+
+


+
+
-
+
-

-
-
-
-
+
+
+
+
+
+


+
+
+

-
+

-
+

-
+


-
-
-
-
-
+
+
+
+
+


-
-
+
+







-
+






-
+
+

-
+


-
+


















-
+


-
-
+
+

-
-
-
+
+
+


-
-
+
+


-
-
+
+

-
-
-
-
+
+
+
+

-
+








	[self readExactlyNBytes: 8
		     intoBuffer: (char*)&ret];

	return of_bswap64_if_be(ret);
}

- (OFDataArray*)readDataArrayWithItemSize: (size_t)itemsize
				andNItems: (size_t)nitems
- (OFDataArray*)readDataArrayWithItemSize: (size_t)itemSize
				andNItems: (size_t)nItems
{
	OFDataArray *da;
	char *tmp;

	da = [OFDataArray dataArrayWithItemSize: itemsize];
	tmp = [self allocMemoryForNItems: nitems
				withSize: itemsize];
	da = [OFDataArray dataArrayWithItemSize: itemSize];
	tmp = [self allocMemoryForNItems: nItems
				withSize: itemSize];

	@try {
		[self readExactlyNBytes: nitems * itemsize
		[self readExactlyNBytes: nItems * itemSize
			     intoBuffer: tmp];

		[da addNItems: nitems
		[da addNItems: nItems
		   fromCArray: tmp];
	} @finally {
		[self freeMemory: tmp];
	}

	return da;
}

- (OFDataArray*)readDataArrayTillEndOfStream
{
	OFDataArray *a;
	char *buf;
	OFDataArray *dataArray;
	char *buffer;

	a = [OFDataArray dataArrayWithItemSize: 1];
	buf = [self allocMemoryWithSize: of_pagesize];
	dataArray = [OFDataArray dataArrayWithItemSize: 1];
	buffer = [self allocMemoryWithSize: of_pagesize];

	@try {
		while (![self isAtEndOfStream]) {
			size_t size;
			size_t length;

			size = [self readNBytes: of_pagesize
				     intoBuffer: buf];
			[a addNItems: size
			  fromCArray: buf];
			length = [self readNBytes: of_pagesize
				       intoBuffer: buffer];
			[dataArray addNItems: length
				  fromCArray: buffer];
		}
	} @finally {
		[self freeMemory: buf];
		[self freeMemory: buffer];
	}

	return a;
	return dataArray;
}

- (OFString*)readLine
{
	return [self readLineWithEncoding: OF_STRING_ENCODING_UTF_8];
}

- (OFString*)readLineWithEncoding: (of_string_encoding_t)encoding
{
	size_t i, len, ret_len;
	char *ret_c, *tmp, *tmp2;
	size_t i, bufferLength, retLength;
	char *retCString, *buffer, *newCache;
	OFString *ret;

	/* Look if there's a line or \0 in our cache */
	if (cache != NULL) {
		for (i = 0; i < cacheLen; i++) {
		for (i = 0; i < cacheLength; i++) {
			if (OF_UNLIKELY(cache[i] == '\n' ||
			    cache[i] == '\0')) {
				ret_len = i;
				retLength = i;

				if (i > 0 && cache[i - 1] == '\r')
					ret_len--;
					retLength--;

				ret = [OFString stringWithCString: cache
							 encoding: encoding
							   length: ret_len];
							   length: retLength];

				newCache = [self
				tmp = [self allocMemoryWithSize: cacheLen -
				    allocMemoryWithSize: cacheLength - i - 1];
								 i - 1];
				if (tmp != NULL)
					memcpy(tmp, cache + i + 1,
					    cacheLen - i - 1);
				if (newCache != NULL)
					memcpy(newCache, cache + i + 1,
					    cacheLength - i - 1);

				[self freeMemory: cache];
				cache = tmp;
				cacheLen -= i + 1;
				cache = newCache;
				cacheLength -= i + 1;

				return ret;
			}
		}
	}

	/* Read until we get a newline or \0 */
	tmp = [self allocMemoryWithSize: of_pagesize];
	buffer = [self allocMemoryWithSize: of_pagesize];

	@try {
		for (;;) {
			if ([self _isAtEndOfStream]) {
				if (cache == NULL)
					return nil;

				ret_len = cacheLen;
				retLength = cacheLength;

				if (retLength > 0 &&
				if (ret_len > 0 && cache[ret_len - 1] == '\r')
					ret_len--;
				    cache[retLength - 1] == '\r')
					retLength--;

				ret = [OFString stringWithCString: cache
							 encoding: encoding
							   length: ret_len];
							   length: retLength];

				[self freeMemory: cache];
				cache = NULL;
				cacheLen = 0;
				cacheLength = 0;

				return ret;
			}

			len = [self _readNBytes: of_pagesize
				     intoBuffer: tmp];
			bufferLength = [self _readNBytes: of_pagesize
					      intoBuffer: buffer];

			/* Look if there's a newline or \0 */
			for (i = 0; i < len; i++) {
				if (OF_UNLIKELY(tmp[i] == '\n' ||
				    tmp[i] == '\0')) {
					ret_len = cacheLen + i;
					ret_c = [self
					    allocMemoryWithSize: ret_len];
			for (i = 0; i < bufferLength; i++) {
				if (OF_UNLIKELY(buffer[i] == '\n' ||
				    buffer[i] == '\0')) {
					retLength = cacheLength + i;
					retCString = [self
					    allocMemoryWithSize: retLength];

					if (cache != NULL)
						memcpy(ret_c, cache, cacheLen);
					memcpy(ret_c + cacheLen, tmp, i);
						memcpy(retCString, cache,
						    cacheLength);
					memcpy(retCString + cacheLength,
					    buffer, i);

					if (ret_len > 0 &&
					    ret_c[ret_len - 1] == '\r')
						ret_len--;
					if (retLength > 0 &&
					    retCString[retLength - 1] == '\r')
						retLength--;

					@try {
						char *rcs = retCString;
						size_t rl = retLength;

						ret = [OFString
						    stringWithCString: ret_c
						    stringWithCString: rcs
							     encoding: encoding
							       length: ret_len];
							       length: rl];
					} @catch (id e) {
						/*
						 * Append data to cache to
						 * prevent loss of data due to
						 * wrong encoding.
						 */
						cache = [self
						    resizeMemory: cache
							  toSize: cacheLen +
								  len];
							  toSize: cacheLength +
								  bufferLength];

						if (cache != NULL)
							memcpy(cache + cacheLen,
							    tmp, len);
							memcpy(cache +
							    cacheLength, buffer,
							    bufferLength);

						cacheLen += len;
						cacheLength += bufferLength;

						@throw e;
					} @finally {
						[self freeMemory: ret_c];
						[self freeMemory: retCString];
					}

					tmp2 = [self
					    allocMemoryWithSize: len - i - 1];
					if (tmp2 != NULL)
						memcpy(tmp2, tmp + i + 1,
						    len - i - 1);
					newCache = [self allocMemoryWithSize:
					    bufferLength - i - 1];
					if (newCache != NULL)
						memcpy(newCache, buffer + i + 1,
						    bufferLength - i - 1);

					[self freeMemory: cache];
					cache = tmp2;
					cacheLen = len - i - 1;
					cache = newCache;
					cacheLength = bufferLength - i - 1;

					return ret;
				}
			}

			/* There was no newline or \0 */
			cache = [self resizeMemory: cache
					    toSize: cacheLen + len];
					    toSize: cacheLength + bufferLength];

			/*
			 * It's possible that cacheLen + len is 0 and thus
			 * cache was set to NULL by resizeMemory:toSize:.
			 */
			if (cache != NULL)
				memcpy(cache + cacheLen, tmp, len);
				memcpy(cache + cacheLength, buffer,
				    bufferLength);

			cacheLen += len;
			cacheLength += bufferLength;
		}
	} @finally {
		[self freeMemory: tmp];
		[self freeMemory: buffer];
	}

	/* Get rid of a warning, never reached anyway */
	assert(0);
}

- (OFString*)readTillDelimiter: (OFString*)delimiter
{
	return [self readTillDelimiter: delimiter
			  withEncoding: OF_STRING_ENCODING_UTF_8];
}

- (OFString*)readTillDelimiter: (OFString*)delimiter
		  withEncoding: (of_string_encoding_t)encoding
{
	const char *delim;
	size_t i, j, delim_len, len, ret_len;
	char *ret_c, *tmp, *tmp2;
	const char *delimiterCString;
	size_t i, j, delimiterLength, bufferLength, retLength;
	char *retCString, *buffer, *newCache;
	OFString *ret;

	/* FIXME: Convert delimiter to specified charset */
	delim = [delimiter cString];
	delim_len = [delimiter cStringLength];
	delimiterCString = [delimiter cString];
	delimiterLength = [delimiter cStringLength];
	j = 0;

	if (delim_len == 0)
	if (delimiterLength == 0)
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];

	/* Look if there's something in our cache */
	if (cache != NULL) {
		for (i = 0; i < cacheLen; i++) {
			if (cache[i] != delim[j++])
		for (i = 0; i < cacheLength; i++) {
			if (cache[i] != delimiterCString[j++])
				j = 0;

			if (j == delim_len || cache[i] == '\0') {
			if (j == delimiterLength || cache[i] == '\0') {
				if (cache[i] == '\0')
					delim_len = 1;
					delimiterLength = 1;

				ret = [OFString stringWithCString: cache
							 encoding: encoding
							   length: i + 1 -
				ret = [OFString
				    stringWithCString: cache
					     encoding: encoding
					      length: i + 1 - delimiterLength];
								   delim_len];

				tmp = [self allocMemoryWithSize: cacheLen - i -
								 1];
				if (tmp != NULL)
					memcpy(tmp, cache + i + 1,
					    cacheLen - i - 1);
				newCache = [self allocMemoryWithSize:
				    cacheLength - i - 1];
				if (newCache != NULL)
					memcpy(newCache, cache + i + 1,
					    cacheLength - i - 1);

				[self freeMemory: cache];
				cache = tmp;
				cacheLen -= i + 1;
				cache = newCache;
				cacheLength -= i + 1;

				return ret;
			}
		}
	}

	/* Read until we get the delimiter or \0 */
	tmp = [self allocMemoryWithSize: of_pagesize];
	buffer = [self allocMemoryWithSize: of_pagesize];

	@try {
		for (;;) {
			if ([self _isAtEndOfStream]) {
				if (cache == NULL)
					return nil;

				ret = [OFString stringWithCString: cache
							 encoding: encoding
							   length: cacheLen];
							   length: cacheLength];

				[self freeMemory: cache];
				cache = NULL;
				cacheLen = 0;
				cacheLength = 0;

				return ret;
			}

			len = [self _readNBytes: of_pagesize
				     intoBuffer: tmp];
			bufferLength = [self _readNBytes: of_pagesize
					      intoBuffer: buffer];

			/* Look if there's the delimiter or \0 */
			for (i = 0; i < len; i++) {
				if (tmp[i] != delim[j++])
			for (i = 0; i < bufferLength; i++) {
				if (buffer[i] != delimiterCString[j++])
					j = 0;

				if (j == delim_len || tmp[i] == '\0') {
					if (tmp[i] == '\0')
						delim_len = 1;
				if (j == delimiterLength || buffer[i] == '\0') {
					if (buffer[i] == '\0')
						delimiterLength = 1;

					ret_len = cacheLen + i + 1 - delim_len;
					ret_c = [self
					    allocMemoryWithSize: ret_len];
					retLength = cacheLength + i + 1 -
					    delimiterLength;
					retCString = [self
					    allocMemoryWithSize: retLength];

					if (cache != NULL &&
					    cacheLength <= retLength)
						memcpy(retCString, cache,
					    cacheLen <= ret_len)
						    cacheLength);
						memcpy(ret_c, cache, cacheLen);
					else if (cache != NULL)
						memcpy(ret_c, cache, ret_len);
					if (i >= delim_len)
						memcpy(ret_c + cacheLen, tmp,
						    i + 1 - delim_len);
						memcpy(retCString, cache,
						    retLength);
					if (i >= delimiterLength)
						memcpy(retCString + cacheLength,
						    buffer, i + 1 -
						    delimiterLength);

					@try {
						char *rcs = retCString;
						size_t rl = retLength;

						ret = [OFString
						    stringWithCString: ret_c
						    stringWithCString: rcs
							     encoding: encoding
							       length: ret_len];
							       length: rl];
					} @finally {
						[self freeMemory: ret_c];
						[self freeMemory: retCString];
					}

					tmp2 = [self
					    allocMemoryWithSize: len - i - 1];
					if (tmp2 != NULL)
						memcpy(tmp2, tmp + i + 1,
						    len - i - 1);
					newCache = [self allocMemoryWithSize:
					    bufferLength - i - 1];
					if (newCache != NULL)
						memcpy(newCache, buffer + i + 1,
						    bufferLength - i - 1);

					[self freeMemory: cache];
					cache = tmp2;
					cacheLen = len - i - 1;
					cache = newCache;
					cacheLength = bufferLength - i - 1;

					return ret;
				}
			}

			/* Neither the delimiter nor \0 was found */
			cache = [self resizeMemory: cache
					    toSize: cacheLen + len];
					    toSize: cacheLength + bufferLength];

			/*
			 * It's possible that cacheLen + len is 0 and thus
			 * cache was set to NULL by resizeMemory:toSize:.
			 */
			if (cache != NULL)
				memcpy(cache + cacheLen, tmp, len);
				memcpy(cache + cacheLength, buffer,
				    bufferLength);

			cacheLen += len;
			cacheLength += bufferLength;
		}
	} @finally {
		[self freeMemory: tmp];
		[self freeMemory: buffer];
	}

	/* Get rid of a warning, never reached anyway */
	assert(0);
}

- (BOOL)buffersWrites
{
	return buffersWrites;
}

- (void)setBuffersWrites: (BOOL)enable
{
	buffersWrites = enable;
}

- (void)flushWriteBuffer
{
	if (wBuffer == NULL)
	if (writeBuffer == NULL)
		return;

	[self _writeNBytes: wBufferLen
		fromBuffer: wBuffer];
	[self _writeNBytes: writeBufferLength
		fromBuffer: writeBuffer];

	[self freeMemory: wBuffer];
	wBuffer = NULL;
	wBufferLen = 0;
	[self freeMemory: writeBuffer];
	writeBuffer = NULL;
	writeBufferLength = 0;
}

- (size_t)writeNBytes: (size_t)size
	   fromBuffer: (const char*)buf
- (size_t)writeNBytes: (size_t)length
	   fromBuffer: (const char*)buffer
{
	if (!buffersWrites)
		return [self _writeNBytes: size
			       fromBuffer: buf];
		return [self _writeNBytes: length
			       fromBuffer: buffer];
	else {
		wBuffer = [self resizeMemory: wBuffer
				      toSize: wBufferLen + size];
		memcpy(wBuffer + wBufferLen, buf, size);
		wBufferLen += size;
		writeBuffer = [self resizeMemory: writeBuffer
					  toSize: writeBufferLength + length];
		memcpy(writeBuffer + writeBufferLength, buffer, length);
		writeBufferLength += length;

		return size;
		return length;
	}
}

- (void)writeInt8: (uint8_t)int8
{
	[self writeNBytes: 1
	       fromBuffer: (char*)&int8];
629
630
631
632
633
634
635
636

637
638
639


640
641
642

643
644
645


646
647
648

649
650
651


652
653

654
655
656
657


658
659
660


661
662

663
664
665

666
667
668

669
670

671
672
673
674
675
676




677
678
679
680
681
682


683
684
685


686
687

688
689
690
691


692
693
694
695
696


697
698

699
700
701
702
703
704
705
706
707

708
709
710
711
712
713
714
645
646
647
648
649
650
651

652
653


654
655
656
657

658
659


660
661
662
663

664
665


666
667
668

669
670
671


672
673
674


675
676
677

678
679
680

681
682
683

684
685

686
687
688




689
690
691
692
693
694
695
696


697
698
699


700
701
702

703
704
705
706

707
708
709
710
711


712
713
714

715
716
717
718
719
720
721
722
723

724
725
726
727
728
729
730
731







-
+

-
-
+
+


-
+

-
-
+
+


-
+

-
-
+
+

-
+


-
-
+
+

-
-
+
+

-
+


-
+


-
+

-
+


-
-
-
-
+
+
+
+




-
-
+
+

-
-
+
+

-
+



-
+
+



-
-
+
+

-
+








-
+







{
	int64 = of_bswap64_if_be(int64);

	[self writeNBytes: 8
	       fromBuffer: (char*)&int64];
}

- (size_t)writeDataArray: (OFDataArray*)dataarray
- (size_t)writeDataArray: (OFDataArray*)dataArray
{
	return [self writeNBytes: [dataarray count] * [dataarray itemSize]
		      fromBuffer: [dataarray cArray]];
	return [self writeNBytes: [dataArray count] * [dataArray itemSize]
		      fromBuffer: [dataArray cArray]];
}

- (size_t)writeString: (OFString*)str
- (size_t)writeString: (OFString*)string
{
	return [self writeNBytes: [str cStringLength]
		      fromBuffer: [str cString]];
	return [self writeNBytes: [string cStringLength]
		      fromBuffer: [string cString]];
}

- (size_t)writeLine: (OFString*)str
- (size_t)writeLine: (OFString*)string
{
	size_t ret, len = [str cStringLength];
	char *buf;
	size_t retLength, stringLength = [string cStringLength];
	char *buffer;

	buf = [self allocMemoryWithSize: len + 1];
	buffer = [self allocMemoryWithSize: stringLength + 1];

	@try {
		memcpy(buf, [str cString], len);
		buf[len] = '\n';
		memcpy(buffer, [string cString], stringLength);
		buffer[stringLength] = '\n';

		ret = [self writeNBytes: len + 1
			     fromBuffer: buf];
		retLength = [self writeNBytes: stringLength + 1
				   fromBuffer: buffer];
	} @finally {
		[self freeMemory: buf];
		[self freeMemory: buffer];
	}

	return ret;
	return retLength;
}

- (size_t)writeFormat: (OFString*)fmt, ...
- (size_t)writeFormat: (OFString*)format, ...
{
	va_list args;
	va_list arguments;
	size_t ret;

	va_start(args, fmt);
	ret = [self writeFormat: fmt
		  withArguments: args];
	va_end(args);
	va_start(arguments, format);
	ret = [self writeFormat: format
		  withArguments: arguments];
	va_end(arguments);

	return ret;
}

- (size_t)writeFormat: (OFString*)fmt
	withArguments: (va_list)args
- (size_t)writeFormat: (OFString*)format
	withArguments: (va_list)arguments
{
	char *t;
	int len;
	char *cString;
	int length;

	if (fmt == nil)
	if (format == nil)
		@throw [OFInvalidArgumentException newWithClass: isa
						       selector: _cmd];

	if ((len = of_vasprintf(&t, [fmt cString], args)) == -1)
	if ((length = of_vasprintf(&cString, [format cString],
	    arguments)) == -1)
		@throw [OFInvalidFormatException newWithClass: isa];

	@try {
		return [self writeNBytes: len
			      fromBuffer: t];
		return [self writeNBytes: length
			      fromBuffer: cString];
	} @finally {
		free(t);
		free(cString);
	}

	/* Get rid of a warning, never reached anyway */
	assert(0);
}

- (size_t)pendingBytes
{
	return cacheLen;
	return cacheLength;
}

- (BOOL)isBlocking
{
	return isBlocking;
}