kennethreitz-archive/gitx
1
0
Fork 0
mirror of https://github.com/kennethreitz-archive/gitx.git synced 2026-06-05 23:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

CommitView: Use null-terminated strings when reading the index

Browse Source
This commit is contained in:
Pieter de Bie
2008-10-03 18:06:41 +02:00
parent 7d0aa866ef
commit 7a5716b24d
1 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PBGitCommitController.m
+26 -14
View File
@@ -51,7 +51,7 @@
if ([string hasSuffix:@"\n"])
string = [string substringToIndex:[string length]-1];
NSArray *lines = [string componentsSeparatedByString:@"\n"];
NSArray *lines = [string componentsSeparatedByString:@"\0"];
return lines;
}
@@ -75,13 +75,13 @@
[handle readToEndOfFileInBackgroundAndNotify];
// Unstaged files
handle = [repository handleInWorkDirForArguments:[NSArray arrayWithObject:@"diff-files"]];
handle = [repository handleInWorkDirForArguments:[NSArray arrayWithObjects:@"diff-files", @"-z", nil]];
[nc addObserver:self selector:@selector(readUnstagedFiles:) name:NSFileHandleReadToEndOfFileCompletionNotification object:handle];
self.busy++;
[handle readToEndOfFileInBackgroundAndNotify];
// Cached files
handle = [repository handleInWorkDirForArguments:[NSArray arrayWithObjects:@"diff-index", @"--cached", @"HEAD", nil]];
handle = [repository handleInWorkDirForArguments:[NSArray arrayWithObjects:@"diff-index", @"--cached", @"-z", @"HEAD", nil]];
[nc addObserver:self selector:@selector(readCachedFiles:) name:NSFileHandleReadToEndOfFileCompletionNotification object:handle];
self.busy++;
[handle readToEndOfFileInBackgroundAndNotify];
@@ -112,12 +112,18 @@
- (void) readUnstagedFiles:(NSNotification *)notification
{
NSArray *lines = [self linesFromNotification:notification];
NSArray *fileStatus;
int even = 0;
for (NSString *line in lines) {
NSArray *components = [line componentsSeparatedByString:@"\t"];
if ([components count] < 2)
break;
if (!even) {
even = 1;
fileStatus = [line componentsSeparatedByString:@" "];
continue;
}
even = 0;
PBChangedFile *file = [[PBChangedFile alloc] initWithPath:line andRepository:repository];
PBChangedFile *file = [[PBChangedFile alloc] initWithPath:[components objectAtIndex:1] andRepository:repository];
file.status = MODIFIED;
file.cached = NO;
@@ -138,15 +144,21 @@
- (void) readCachedFiles:(NSNotification *)notification
{
NSLog(@"Reading cached files!");
NSArray *lines = [self linesFromNotification:notification];
NSLog(@"Reading cached files!");
NSArray *fileStatus;
int even = 0;
for (NSString *line in lines) {
NSArray *components = [line componentsSeparatedByString:@"\t"];
if ([components count] < 2)
break;
PBChangedFile *file = [[PBChangedFile alloc] initWithPath:[components objectAtIndex:1] andRepository:repository];
file.status = MODIFIED;
if (!even) {
even = 1;
fileStatus = [line componentsSeparatedByString:@" "];
continue;
}
even = 0;
PBChangedFile *file = [[PBChangedFile alloc] initWithPath:line andRepository:repository];
file.status = MODIFIED;
file.cached = YES;
[cachedFilesController addObject: file];
}