BookMacster 1.15.7 "point 5".

Author: jerrykrinock

SSYAlert.m

@@ -663,7 +663,7 @@ + (void)supportError:(NSError*)error {
 		if ([mailableDescription hasSuffix:SSYDidTruncateErrorDescriptionTrailer]) {
 			// We'll write a file to package the error's longDescription which was too long to
 			// fit in the email, and ask the user to zip and attach it.
-			NSString* longDescription = [error performSelector:@selector(longDescription)] ;
+			NSString* longDescription = [error longDescription] ;
 
 			NSString* filename = [NSString stringWithFormat:
 								  @"%@-Error-%lx.txt",

SSYDebug.m

@@ -13,11 +13,11 @@
 								 [[NSThread currentThread] name]] ;
 
 	[nsString appendString:@"   Slide(0x) Library\n"] ;
-	NSUInteger i;
+	uint32_t i;
 	NSUInteger count = _dyld_image_count();
 
 	for (i = 0; i < count; i++) {
-		intptr_t slide = _dyld_get_image_vmaddr_slide(i); 
+		intptr_t slide = (intptr_t)_dyld_get_image_vmaddr_slide(i);
 		NSString* name = [NSString stringWithUTF8String:_dyld_get_image_name(i)] ;
 		NSString* exclude1 = @"/usr/lib/" ;
 		NSString* exclude2 = @"/System/Library/" ;
@@ -34,7 +34,7 @@
 	// An infinite loop will "blow its stack" at 512 calls, so
 	// we allow a little more than that.
 	void* callstack[514] ;
-	NSInteger frames = backtrace(callstack, 514) ;
+	int frames = backtrace(callstack, 514) ;
 	char** strs = backtrace_symbols(callstack, frames) ;
 	NSInteger iFrame ;
 	for (iFrame = 1; iFrame < frames; ++iFrame) {
@@ -73,7 +73,7 @@ NSInteger SSYDebugStackDepth(void) {
 	NSMutableString* nsString = [[NSMutableString alloc] init] ;
 
 	void* callstack[depth] ;
-	NSInteger frames = backtrace(callstack, depth) ;
+	int frames = backtrace(callstack, (int)depth) ;
 	char** strs = backtrace_symbols(callstack, frames) ;
 	NSInteger iFrame ;
 	for (iFrame = 2; iFrame < frames; ++iFrame) {
@@ -92,7 +92,7 @@ NSInteger SSYDebugStackDepth(void) {
 
 NSString* SSYDebugCaller(void) {
 	void* callstack[3] ;
-	NSInteger frames = backtrace(callstack, 3) ;
+	int frames = backtrace(callstack, 3) ;
 	char** strs = backtrace_symbols(callstack, frames) ;
 	NSString* caller = [NSString stringWithCString:strs[2]
 										  encoding:NSUTF8StringEncoding] ;

SSYDooDooUndoManager.m

@@ -33,7 +33,7 @@ - (id)initWithDocument:(NSPersistentDocument*)document {
 	if (self != nil) {
 		NSAssert(document != nil, @"SSYDooDooUndoManager got no document") ;
 
-	//	[self setGroupsByEvent:NO] ;  // Causes all hell to break loose with Core Data.
+        //	[self setGroupsByEvent:NO] ;  // Causes all hell to break loose with Core Data.
 
 		// We cast to an id since the compiler expects these to methods
 		// to get something which inherits from NSUndoManager, which 

SSYDropboxGuy.h

@@ -20,12 +20,6 @@ __attribute__((visibility("default"))) @interface SSYDropboxGuy : NSObject
 */
 + (void)getDropbox ;
 
-/*!
- @brief    Returns whether or not a given path is in the Dropbox
- archive, indicating that it was replaced by Dropbox.
-*/
-+ (BOOL)wasReplacedByDropboxPath:(NSString*)path ;
-
 + (NSString*)defaultDropboxPath ;
 
 + (BOOL)dropboxIsAvailable ;
@@ -43,6 +37,22 @@ __attribute__((visibility("default"))) @interface SSYDropboxGuy : NSObject
  */
 + (NSInteger)isInDropboxPath:(NSString*)path ;
 
+/*!
+ @brief    Returns whether or not a given path is probably in the user's
+ Dropbox "cache", which is its "Trash".
+ 
+ @details  A folder gets in the Dropbox "Trash" if it is trashed on another
+ computer, or replaced on another computer.
+ 
+ This method detects whether or not any of the given path's ancester
+ folders are ".dropbox.cache".  Therefore, it can return a false positive if
+ some user creates such a folder of their own accord and puts stuff in it.
+ 
+ If path is nil, returns NO.
+ */
++ (NSInteger)isInDropboxTrashPath:(NSString*)path ;
+
+
 #if 0
 /*
  The following methods no longer work if user has Dropbox 1.2 or later, because

SSYDropboxGuy.m

@@ -30,10 +30,6 @@ + (void)getDropbox {
 							activate:YES] ;
 }
 
-+ (BOOL)wasReplacedByDropboxPath:(NSString*)path {
-	return [path hasPrefix:[NSHomeDirectory() stringByAppendingPathComponent:@".dropbox/cache/"]] ;
-}
-
 + (NSString*)defaultDropboxPath {
 	NSString* path = [NSHomeDirectory() stringByAppendingPathComponent:@"Dropbox"] ;
 
@@ -72,7 +68,17 @@ + (NSInteger)isInDropboxPath:(NSString*)path {
     return NSOffState ;
 }
 
-
++ (NSInteger)isInDropboxTrashPath:(NSString*)path {
+    BOOL answer = NO ;
+    if (path) {
+        NSArray* components = [path pathComponents] ;
+        if ([components indexOfObject:@".dropbox.cache"] != NSNotFound) {
+            answer = YES ;
+        }
+    }
+    
+    return answer ;
+}
 
 /*
  The following methods no longer work if user has Dropbox 1.2 or later, because

SSYLaunchdGuy.m

@@ -382,7 +382,7 @@ + (pid_t)pidIfRunningLabel:(NSString*)label {
 		NSArray* words = [trimmedResponse componentsSeparatedByString:@" "] ;
 		if ([words count] > 0) {
 			NSString* pidString = [words objectAtIndex:0] ;
-			pid = [pidString integerValue] ;
+            pid = [pidString intValue] ;
 		}
 	}
 

SSYMojo.m

@@ -187,7 +187,15 @@ - (NSManagedObject*)freshObject {
 
 	NSManagedObject* object = [NSEntityDescription insertNewObjectForEntityForName:[self entityName]
 															inManagedObjectContext:moc] ;	
-	return object ;
+#if 11
+#warning Testing insertions not on main thread
+    if (![[NSThread currentThread] isMainThread]) {
+        NSLog(@"Internal Error 523-0024 %@\n%@",
+              [self entityName],
+              SSYDebugBacktraceDepth(8)) ;
+    }
+#endif
+    return object ;
 }
 
 - (NSManagedObject*)objectWithID:(NSManagedObjectID*)objectID {

SSYPathObserver.m

@@ -25,13 +25,13 @@
 @interface SSYPathWatch : NSObject {
 	NSString* m_path ;
 	id m_userInfo ;
-	NSInteger m_fileDescriptor ;
+	uint32_t m_fileDescriptor ;
 	NSThread* m_notifyThread ;
 }
 
 @property (retain) NSString* path ;
 @property (retain) id userInfo ;
-@property (assign) NSInteger fileDescriptor ;
+@property (assign) uint32_t fileDescriptor ;
 @property (assign) NSThread* notifyThread ;
 
 @end
@@ -120,7 +120,7 @@ camping on kevent(), outside of these two blocks of code, but,
 	 oh, well if you don't try to write perfect code, you'll have
 	 lots of bugs. */
 
-	NSInteger fileDescriptor ;
+	int fileDescriptor ;
 	@synchronized(self) {
 		NSAutoreleasePool* pool1 = [[NSAutoreleasePool alloc] init] ;
 
@@ -210,7 +210,7 @@ -(id)init {
 		[self setIsWatching:YES] ;
 		[self setPathWatches:[NSMutableSet set]] ;
 
-		NSInteger kqueueFileDescriptor = kqueue() ;
+		uint32_t kqueueFileDescriptor = kqueue() ;
 		if (kqueueFileDescriptor == -1) {
 			NSLog(@"Internal Error 153-9092.  Failed creating kqueue") ;
 			// See http://lists.apple.com/archives/Objc-language/2008/Sep/msg00133.html ...
@@ -335,7 +335,7 @@ - (oneway void)release {
 			// Close any file descriptors which might still be open
 			for (SSYPathWatch* pathWatch in [self pathWatches]) {
 				// Unregister kqueue of the target pathWatch
-				NSInteger fileDescriptor = [pathWatch fileDescriptor] ;
+				uint32_t fileDescriptor = [pathWatch fileDescriptor] ;
 				NSInteger result = close(fileDescriptor) ;
 				if (result != 0) {
 				}
@@ -352,7 +352,7 @@ - (oneway void)release {
 			}
 #endif
 
-			NSInteger kqfd = [self kqueueFileDescriptor] ;
+			uint32_t kqfd = [self kqueueFileDescriptor] ;
 
 			// The following causes the watcher thread to exit in Mac OS 10.6,
 			// but not in Mac OS 10.5.
@@ -384,7 +384,7 @@ - (BOOL)addPath:(NSString*)path
 	BOOL ok = YES ;
 
 	// Get file descriptor for given path
-	NSInteger fileDescriptor = open([path UTF8String], O_RDONLY) ;	
+	uint32_t fileDescriptor = open([path UTF8String], O_RDONLY) ;	
 	if (fileDescriptor == -1) {
 		if (error_p) {
 			NSDictionary* userInfo = [NSDictionary dictionaryWithObjectsAndKeys:

SSYPersistentDocumentMultiMigrator.h

@@ -32,6 +32,7 @@ extern NSString* const SSYPersistentDocumentMultiMigratorDidEndMigrationNotifica
 #define SSYPersistentDocumentMultiMigratorErrorCodeCouldNotCopyFile 315015
 #define SSYPersistentDocumentMultiMigratorErrorCodeCouldNotSwapFile 315016
 #define SSYPersistentDocumentMultiMigratorErrorCodeCouldNotRemoveTempFile 315020
+#define SSYPersistentDocumentMultiMigratorErrorCodeCouldNotCopyUnwriteableFile 315021
 
 @interface SSYPersistentDocumentMultiMigrator : NSObject
 

SSYPersistentDocumentMultiMigrator.m

@@ -251,7 +251,33 @@ + (BOOL)migrateIfNeededStoreAtUrl:(NSURL*)url
 			goto end ;
 		}
 
-		// Do the migration, creating a new file at destempUrl.
+#if 0
+        // Fix 20130610
+        BOOL isWritable = [[NSFileManager defaultManager] isWritableFileAtPath:[url absoluteString]] ;
+        BOOL isInViewingMode = [document isInViewingMode] ;
+        /*SSYDBL*/ NSLog(@"isWritable = %ld   isInViewingMode = %ld ", isWritable, isInViewingMode) ;
+        if (isInViewingMode) {
+            NSString* fileNameExtension = [[url absoluteString] pathExtension] ;
+            NSString* writablePath = [[[NSFileManager defaultManager] temporaryFilePath] stringByAppendingPathExtension:fileNameExtension] ;
+            /*SSYDBL*/ NSLog(@"Not writable.\nCopying: %@\n     To: %@", [url absoluteString], writablePath) ;
+            ok = [[NSFileManager defaultManager] copyItemAtPath:[url absoluteString]
+                                                         toPath:writablePath
+                                                          error:&underlyingError] ;
+            if (!ok) {
+                errorCode = SSYPersistentDocumentMultiMigratorErrorCodeCouldNotCopyUnwriteableFile ;
+                [errorInfo setValue:writablePath
+                             forKey:@"Writable Path"] ;
+                [errorInfo setValue:[url absoluteString]
+                             forKey:@"Source Path"] ;
+                goto end ;
+            }
+            
+            url = [NSURL fileURLWithPath:writablePath] ;
+            [document setFileURL:url] ;
+        }
+#endif
+        
+        // Do the migration, creating a new file at destempUrl.
 		// Because the Core Data Model Versioning and Data Migration Programming Guide
 		// indicates that this method reads the whole store into memory, and this
 		// could be a lot, we use a local autorelease pool, transferring any

SSYSqliter.m

@@ -795,7 +795,7 @@ - (BOOL)checkpointAndCloseError_p:(NSError**)error_p {
                                        SQLITE_CHECKPOINT_PASSIVE,
                                        &nFramesLogged,
                                        &nFramesCheckpointed) ;
-	if ((result != SQLITE_OK) && error_p) {  
+	if ((result != SQLITE_OK) && error_p) {
 		*error_p = [self makeErrorWithAppCode:453035
 								   sqliteCode:result
 							sqliteDescription:sqlite3_errmsg([self db])

SSYTasker.m

@@ -97,24 +97,27 @@ @implementation SSYTasker
 @synthesize error = m_error ;
 
 - (void)processNote:(NSNotification*)note
+              logAs:(NSString*)logAs
            intoData:(NSMutableData *)mutableData {
     NSFileHandle* fileHandle = (NSFileHandle*)[note object] ;
     NSError* error = nil ;
     NSData* data = [fileHandle availableDataError_p:&error] ;
     if (error) {
         [self setError:error] ;
     }
+
+    /*SSYDBL*/ NSLog(@"Got from %@ %04ld bytes.", logAs, [data length]) ;
     if ([data length] > 0) {
-        [mutableData appendData:data] ;
+
+       [mutableData appendData:data] ;
         // Tell the fileHandle that we want more data.
         [fileHandle waitForDataInBackgroundAndNotify] ;
     }
     else {
-        // I've not seen this happen, because I always get
-        // NSTaskDidTerminateNotification first.  But it might??  If it does,
-        // according to documentation, it tells us that either stdout or stderr
-        // is done.  We ignore it and wait instead for
-        // NSTaskDidTerminateNotification.
+        // According to documentation, it tells us that either stdout or stderr
+        // is done.  In my experience, this branch usually does not execute
+        // in a typical program run.  But somtimes it does.  We ignore it and
+        // wait instead for NSTaskDidTerminateNotification which is reliable.
     }
 }
 
@@ -126,6 +129,7 @@ - (void)eatStdoutNote:(NSNotification*)note {
     }
 
     [self processNote:note
+                logAs:@"stdout"
              intoData:mutableData];
 }
 
@@ -137,6 +141,7 @@ - (void)eatStderrNote:(NSNotification*)note {
     }
 
     [self processNote:note
+                logAs:@"stderr"
              intoData:mutableData];
 }
 
@@ -256,7 +261,8 @@ - (NSInteger)runCommand:(NSString*)launchPath
                 // Just run the loop again, to wait for next notification or done.
             }
         } while ([self isTaskDone] == NO) ;
-        
+        /*SSYDBL*/ NSLog(@"Done") ;
+
         exitStatus = [task terminationStatus] ;
 
         [[NSNotificationCenter defaultCenter] removeObserver:self] ;