mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
Nathan Kinsinger
dcba769fd3
After the last line is read from the fileDescriptor the callee will call
readLine once last time. If the (uninitialized) buffer just happened to
contain '\r' then this method would increment bytesReceived, then
decrement it (because it has '\r' in it), then decrement it agin and
assign a null byte to the byte before the buffer (stepping on who knows
what). Then it would return the '\r'. Then, since it received something,
the callee would call readLine again, malloc would give the same buffer
it did before (with the '\r') and everything would repeat.
- initialize the buffer
- increment bytesReceived only if a byte is actually received
- don't do any work in the loop if there were no bytes received
- EINTR is a recoverable error, just reread
- give the actual reason for an error rather than some random string
- free the buffer when a newline is found or when there is an error
79 lines
2.0 KiB
Objective-C
79 lines
2.0 KiB
Objective-C
/*
|
|
* Extension for NSFileHandle to make it capable of easy network programming
|
|
*
|
|
* Version 1.0, get the newest from http://michael.stapelberg.de/NSFileHandleExt.php
|
|
*
|
|
* Copyright 2007 Michael Stapelberg
|
|
*
|
|
* Distributed under BSD-License, see http://michael.stapelberg.de/BSD.php
|
|
*
|
|
*/
|
|
|
|
|
|
#define CONN_TIMEOUT 5
|
|
#define BUFFER_SIZE 256
|
|
|
|
@implementation NSFileHandle(NSFileHandleExt)
|
|
|
|
-(NSString*)readLine {
|
|
// If the socket is closed, return an empty string
|
|
if ([self fileDescriptor] <= 0)
|
|
return @"";
|
|
|
|
int fd = [self fileDescriptor];
|
|
|
|
// Allocate BUFFER_SIZE bytes to store the line
|
|
int bufferSize = BUFFER_SIZE;
|
|
char *buffer = (char*)malloc(bufferSize + 1);
|
|
if (buffer == NULL)
|
|
[[NSException exceptionWithName:@"No memory left" reason:@"No more memory for allocating buffer" userInfo:nil] raise];
|
|
buffer[0] = '\0';
|
|
|
|
int bytesReceived = 0, n = 0;
|
|
|
|
while (1) {
|
|
n = read(fd, buffer + bytesReceived, 1);
|
|
|
|
if (n == 0)
|
|
break;
|
|
|
|
if (n < 0) {
|
|
if (errno == EINTR)
|
|
continue;
|
|
|
|
free(buffer);
|
|
NSString *reason = [NSString stringWithFormat:@"%s:%d: read() error: %s", __PRETTY_FUNCTION__, __LINE__, strerror(errno)];
|
|
[[NSException exceptionWithName:@"Socket error" reason:reason userInfo:nil] raise];
|
|
}
|
|
|
|
bytesReceived++;
|
|
|
|
if (bytesReceived >= bufferSize) {
|
|
// Make buffer bigger
|
|
bufferSize += BUFFER_SIZE;
|
|
buffer = (char *)reallocf(buffer, bufferSize + 1);
|
|
if (buffer == NULL)
|
|
[[NSException exceptionWithName:@"No memory left" reason:@"No more memory for allocating buffer" userInfo:nil] raise];
|
|
}
|
|
|
|
char receivedByte = buffer[bytesReceived-1];
|
|
if (receivedByte == '\n') {
|
|
bytesReceived--;
|
|
break;
|
|
}
|
|
|
|
if (receivedByte == '\r')
|
|
bytesReceived--;
|
|
}
|
|
|
|
buffer[bytesReceived] = '\0';
|
|
NSString *retVal = [NSString stringWithCString: buffer encoding: NSUTF8StringEncoding];
|
|
if ([retVal length] == 0)
|
|
retVal = [NSString stringWithCString: buffer encoding: NSISOLatin1StringEncoding];
|
|
|
|
free(buffer);
|
|
return retVal;
|
|
}
|
|
|
|
@end
|