File tree 3 files changed +9
-5
lines changed
3 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -49,7 +49,7 @@ -(NSString*)readLine {
49
49
buffer[bytesReceived-1 ] = ' \0 ' ;
50
50
NSString * s = [NSString stringWithCString: buffer encoding: NSUTF8StringEncoding];
51
51
if ([s length ] == 0 )
52
- s = [NSString stringWithCString: buffer encoding: NSASCIIStringEncoding ];
52
+ s = [NSString stringWithCString: buffer encoding: NSISOLatin1StringEncoding ];
53
53
return s;
54
54
case ' \r ' :
55
55
bytesReceived--;
@@ -59,7 +59,7 @@ -(NSString*)readLine {
59
59
buffer[bytesReceived-1 ] = ' \0 ' ;
60
60
NSString *retVal = [NSString stringWithCString: buffer encoding: NSUTF8StringEncoding];
61
61
if ([retVal length ] == 0 )
62
- retVal = [NSString stringWithCString: buffer encoding: NSASCIIStringEncoding ];
62
+ retVal = [NSString stringWithCString: buffer encoding: NSISOLatin1StringEncoding ];
63
63
64
64
free (buffer);
65
65
return retVal;
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ + (NSString*) outputForCommand:(NSString *) cmd
76
76
NSData * data = [handle readDataToEndOfFile ];
77
77
NSString *string = [[NSString alloc ] initWithData: data encoding: NSUTF8StringEncoding];
78
78
if (!string)
79
- string = [[NSString alloc ] initWithData: data encoding: NSASCIIStringEncoding ];
79
+ string = [[NSString alloc ] initWithData: data encoding: NSISOLatin1StringEncoding ];
80
80
81
81
// Strip trailing newline
82
82
if ([string hasSuffix: @" \n " ])
@@ -101,7 +101,7 @@ + (NSString*) outputForCommand: (NSString*) cmd withArgs: (NSArray*) args inDir
101
101
NSData * data = [handle readDataToEndOfFile ];
102
102
NSString *string = [[NSString alloc ] initWithData: data encoding: NSUTF8StringEncoding];
103
103
if (!string)
104
- string = [[NSString alloc ] initWithData: data encoding: NSASCIIStringEncoding ];
104
+ string = [[NSString alloc ] initWithData: data encoding: NSISOLatin1StringEncoding ];
105
105
106
106
// Strip trailing newline
107
107
if ([string hasSuffix: @" \n " ])
Original file line number Diff line number Diff line change @@ -77,7 +77,11 @@ - (NSString*) contents
77
77
data = [handle readDataToEndOfFile ];
78
78
}
79
79
80
- return [[NSString alloc ] initWithData: data encoding: NSUTF8StringEncoding];
80
+ NSString * string = [[NSString alloc ] initWithData: data encoding: NSUTF8StringEncoding];
81
+ if (!string) {
82
+ string = [[NSString alloc ] initWithData: data encoding: NSISOLatin1StringEncoding];
83
+ }
84
+ return string;
81
85
}
82
86
83
87
- (void ) saveToFolder : (NSString *) dir
You can’t perform that action at this time.
0 commit comments