Skip to content

Commit bc86445

Browse files
committed
Fix for ^D
1 parent d7ea2ed commit bc86445

1 file changed

Lines changed: 9 additions & 4 deletions

File tree

planck/Planck.m

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,9 @@ -(void)runInit:(NSString*)initPath eval:(NSString*)evalArg srcPath:(NSString*)sr
298298
NSString* input = nil;
299299
for (;;) {
300300
NSString* inputLine = [self getInput];
301+
if (inputLine == nil) {
302+
break;
303+
}
301304

302305
if (input == nil) {
303306
input = inputLine;
@@ -335,10 +338,12 @@ -(NSString *) getInput
335338
{
336339
NSFileHandle *input = [NSFileHandle fileHandleWithStandardInput];
337340
NSData *inputData = [input availableData];
338-
NSString *inputString = [[NSString alloc] initWithData: inputData encoding:NSUTF8StringEncoding];
339-
inputString = [inputString stringByTrimmingCharactersInSet: [NSCharacterSet newlineCharacterSet]];
340-
341-
return inputString;
341+
if (inputData.length) {
342+
NSString *inputString = [[NSString alloc] initWithData: inputData encoding:NSUTF8StringEncoding];
343+
return [inputString stringByTrimmingCharactersInSet: [NSCharacterSet newlineCharacterSet]];
344+
} else {
345+
return nil;
346+
}
342347
}
343348

344349
-(void)requireAppNamespaces:(JSContext*)context

0 commit comments

Comments
 (0)