Updated version to 1.8.7

Thanks to https://github.com/gusc (Gusts Kaksis) for the patch.

.gitignore

@@ -2,3 +2,5 @@ build/*
 node_modules/*
 /.DS_Store
 *~
+src/scripts/lldb.pyc
+src/ios-deploy/lldb.py.h

ios-deploy.xcodeproj/xcshareddata/xcschemes/ios-deploy-tests.xcscheme

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0720"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "7E8E3A821C45D4CE0017F6C1"
+               BuildableName = "ios-deploy-tests.xctest"
+               BlueprintName = "ios-deploy-tests"
+               ReferencedContainer = "container:ios-deploy.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ios-deploy",
-  "version": "1.8.4",
+  "version": "1.8.7",
   "os": [
     "darwin"
   ],
@@ -18,7 +18,7 @@
   },
   "scripts": {
     "preinstall": "./src/scripts/check_reqs.js && xcodebuild",
-    "test": "npm run pycompile && npm run jshint && xcodebuild -scheme ios-deploy-lib && xcodebuild test -scheme ios-deploy-tests",
+    "test": "npm run pycompile && npm run jshint && xcodebuild -target ios-deploy-lib && xcodebuild test -scheme ios-deploy-tests",
     "jshint": "node node_modules/jshint/bin/jshint src/scripts/*.js",
     "pycompile": "python -m py_compile src/scripts/*.py"
   },

src/ios-deploy/ios-deploy.m

@@ -76,8 +76,8 @@ int AMDeviceGetInterfaceType(struct am_device *device);
 bool found_device = false, debug = false, verbose = false, unbuffered = false, nostart = false, detect_only = false, install = true, uninstall = false, no_wifi = false;
 bool command_only = false;
 char *command = NULL;
-char *target_filename = NULL;
-char *upload_pathname = NULL;
+char const*target_filename = NULL;
+char const*upload_pathname = NULL;
 char *bundle_id = NULL;
 bool interactive = true;
 bool justlaunch = false;
@@ -86,7 +86,7 @@ char *device_id = NULL;
 char *args = NULL;
 char *list_root = NULL;
 int _timeout = 0;
-int port = 0;	// 0 means "dynamically assigned"
+int port = 0;    // 0 means "dynamically assigned"
 CFStringRef last_path = NULL;
 service_conn_t gdbfd;
 pid_t parent = 0;
@@ -122,8 +122,8 @@ void on_error(NSString* format, ...)
     NSString* str = [[[NSString alloc] initWithFormat:format arguments:valist] autorelease];
     va_end(valist);
 
-    NSLog(@"[ !! ] %@", str);    
-    
+    NSLog(@"[ !! ] %@", str);
+
     exit(exitcode_error);
 }
 
@@ -135,7 +135,7 @@ void on_sys_error(NSString* format, ...) {
     va_start(valist, format);
     NSString* str = [[[NSString alloc] initWithFormat:format arguments:valist] autorelease];
     va_end(valist);
-    
+
     on_error(@"%@ : %@", str, [NSString stringWithUTF8String:errstr]);
 }
 
@@ -147,25 +147,25 @@ void __NSLogOut(NSString* format, va_list valist) {
 void NSLogOut(NSString* format, ...) {
     va_list valist;
     va_start(valist, format);
-	__NSLogOut(format, valist);
+    __NSLogOut(format, valist);
     va_end(valist);
 }
 
 void NSLogVerbose(NSString* format, ...) {
-	if (verbose) {
-		va_list valist;
-		va_start(valist, format);
-		__NSLogOut(format, valist);
-		va_end(valist);
-	}
+    if (verbose) {
+        va_list valist;
+        va_start(valist, format);
+        __NSLogOut(format, valist);
+        va_end(valist);
+    }
 }
 
 
 BOOL mkdirp(NSString* path) {
     NSError* error = nil;
-    BOOL success = [[NSFileManager defaultManager] createDirectoryAtPath:path 
-                                             withIntermediateDirectories:YES 
-                                                              attributes:nil 
+    BOOL success = [[NSFileManager defaultManager] createDirectoryAtPath:path
+                                             withIntermediateDirectories:YES
+                                                              attributes:nil
                                                                    error:&error];
     return success;
 }
@@ -360,11 +360,11 @@ const CFStringRef get_device_hardware_name(const AMDeviceRef device) {
     GET_FRIENDLY_MODEL_NAME(model, "N53AP", "iPhone 5s (Global/CDMA)")
     GET_FRIENDLY_MODEL_NAME(model, "N61AP", "iPhone 6 (GSM)")
     GET_FRIENDLY_MODEL_NAME(model, "N56AP", "iPhone 6 Plus")
-
-	GET_FRIENDLY_MODEL_NAME(model, "N71mAP", "iPhone 6s")
-	GET_FRIENDLY_MODEL_NAME(model, "N71AP", "iPhone 6s")
-	GET_FRIENDLY_MODEL_NAME(model, "N66AP", "iPhone 6s Plus")
-	GET_FRIENDLY_MODEL_NAME(model, "N66mAP", "iPhone 6s Plus")
+    GET_FRIENDLY_MODEL_NAME(model, "N71mAP", "iPhone 6s")
+    GET_FRIENDLY_MODEL_NAME(model, "N71AP", "iPhone 6s")
+    GET_FRIENDLY_MODEL_NAME(model, "N66AP", "iPhone 6s Plus")
+    GET_FRIENDLY_MODEL_NAME(model, "N66mAP", "iPhone 6s Plus")
+    GET_FRIENDLY_MODEL_NAME(model, "N69AP", "iPhone SE")
 
     return model;
 }
@@ -397,8 +397,8 @@ CFStringRef get_device_full_name(const AMDeviceRef device) {
     device_name = AMDeviceCopyValue(device, 0, CFSTR("DeviceName")),
     model_name = get_device_hardware_name(device);
 
-	NSLogVerbose(@"Device Name: %@", device_name);
-	NSLogVerbose(@"Model Name: %@", model_name);
+    NSLogVerbose(@"Device Name: %@", device_name);
+    NSLogVerbose(@"Model Name: %@", model_name);
 
     if(device_name != NULL && model_name != NULL)
     {
@@ -536,9 +536,9 @@ void mount_developer_image(AMDeviceRef device) {
     CFStringRef image_path = copy_developer_disk_image_path(device);
     CFStringRef sig_path = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@.signature"), image_path);
 
-	NSLogVerbose(@"Device support path: %@", ds_path);
-	NSLogVerbose(@"Developer disk image: %@", image_path);
-	CFRelease(ds_path);
+    NSLogVerbose(@"Device support path: %@", ds_path);
+    NSLogVerbose(@"Developer disk image: %@", image_path);
+    CFRelease(ds_path);
 
     FILE* sig = fopen(CFStringGetCStringPtr(sig_path, kCFStringEncodingMacRoman), "rb");
     void *sig_buf = malloc(128);
@@ -599,7 +599,7 @@ CFURLRef copy_device_app_url(AMDeviceRef device, CFStringRef identifier) {
     CFDictionaryRef result = nil;
 
     NSArray *a = [NSArray arrayWithObjects:
-                  @"CFBundleIdentifier",			// absolute must
+                  @"CFBundleIdentifier",            // absolute must
                   @"ApplicationDSID",
                   @"ApplicationType",
                   @"CFBundleExecutable",
@@ -624,7 +624,7 @@ CFURLRef copy_device_app_url(AMDeviceRef device, CFStringRef identifier) {
                   nil];
 
     NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"];
-	CFDictionaryRef options = (CFDictionaryRef)optionsDict;
+    CFDictionaryRef options = (CFDictionaryRef)optionsDict;
 
     check_error(AMDeviceLookupApplications(device, options, &result));
 
@@ -643,9 +643,9 @@ CFStringRef copy_disk_app_identifier(CFURLRef disk_app_url) {
     CFURLRef plist_url = CFURLCreateCopyAppendingPathComponent(NULL, disk_app_url, CFSTR("Info.plist"), false);
     CFReadStreamRef plist_stream = CFReadStreamCreateWithFile(NULL, plist_url);
     if (!CFReadStreamOpen(plist_stream)) {
-    	on_error(@"Cannot read Info.plist file: %@", plist_url);
+      on_error(@"Cannot read Info.plist file: %@", plist_url);
     }
-	
+
     CFPropertyListRef plist = CFPropertyListCreateWithStream(NULL, plist_stream, 0, kCFPropertyListImmutable, NULL, NULL);
     CFStringRef bundle_identifier = CFRetain(CFDictionaryGetValue(plist, CFSTR("CFBundleIdentifier")));
     CFReadStreamClose(plist_stream);
@@ -722,14 +722,14 @@ void write_lldb_prep_cmds(AMDeviceRef device, CFURLRef disk_app_url) {
     CFStringFindAndReplace(cmds, CFSTR("{disk_container}"), disk_container_path, range, 0);
 
     NSString* python_file_path = [NSString stringWithFormat:@"/tmp/%@/fruitstrap_", tmpUUID];
-	mkdirp(python_file_path);
-	
+    mkdirp(python_file_path);
+
     NSString* python_command = @"fruitstrap_";
     if(device_id != NULL) {
-		python_file_path = [python_file_path stringByAppendingString:[NSString stringWithUTF8String:device_id]];
-		python_command = [python_command stringByAppendingString:[NSString stringWithUTF8String:device_id]];
+        python_file_path = [python_file_path stringByAppendingString:[NSString stringWithUTF8String:device_id]];
+        python_command = [python_command stringByAppendingString:[NSString stringWithUTF8String:device_id]];
     }
-	python_file_path = [python_file_path stringByAppendingString:@".py"];
+    python_file_path = [python_file_path stringByAppendingString:@".py"];
 
     CFStringFindAndReplace(cmds, CFSTR("{python_command}"), (CFStringRef)python_command, range, 0);
     range.length = CFStringGetLength(cmds);
@@ -740,7 +740,7 @@ void write_lldb_prep_cmds(AMDeviceRef device, CFURLRef disk_app_url) {
     NSString* prep_cmds_path = [NSString stringWithFormat:PREP_CMDS_PATH, tmpUUID];
     if(device_id != NULL) {
         prep_cmds_path = [prep_cmds_path stringByAppendingString:[NSString stringWithUTF8String:device_id]];
-	}
+    }
     FILE *out = fopen([prep_cmds_path UTF8String], "w");
     fwrite(CFDataGetBytePtr(cmds_data), CFDataGetLength(cmds_data), 1, out);
     // Write additional commands based on mode we're running in
@@ -993,12 +993,12 @@ void launch_debugger(AMDeviceRef device, CFURLRef url) {
             setup_dummy_pipe_on_stdin(pfd);
 
         NSString* lldb_shell;
-		NSString* prep_cmds = [NSString stringWithFormat:PREP_CMDS_PATH, tmpUUID];
-		lldb_shell = [NSString stringWithFormat:LLDB_SHELL, prep_cmds];
-		
+        NSString* prep_cmds = [NSString stringWithFormat:PREP_CMDS_PATH, tmpUUID];
+        lldb_shell = [NSString stringWithFormat:LLDB_SHELL, prep_cmds];
+
         if(device_id != NULL) {
-			lldb_shell = [lldb_shell stringByAppendingString: [NSString stringWithUTF8String:device_id]];
-		}
+            lldb_shell = [lldb_shell stringByAppendingString: [NSString stringWithUTF8String:device_id]];
+        }
 
         int status = system([lldb_shell UTF8String]); // launch lldb
         if (status == -1)
@@ -1034,10 +1034,10 @@ void launch_debugger_and_exit(AMDeviceRef device, CFURLRef url) {
 
 
         NSString* prep_cmds = [NSString stringWithFormat:PREP_CMDS_PATH, tmpUUID];
-		NSString* lldb_shell = [NSString stringWithFormat:LLDB_SHELL, prep_cmds];
+        NSString* lldb_shell = [NSString stringWithFormat:LLDB_SHELL, prep_cmds];
         if(device_id != NULL) {
-			lldb_shell = [lldb_shell stringByAppendingString:[NSString stringWithUTF8String:device_id]];
-		}
+            lldb_shell = [lldb_shell stringByAppendingString:[NSString stringWithUTF8String:device_id]];
+        }
 
         int status = system([lldb_shell UTF8String]); // launch lldb
         if (status == -1)
@@ -1122,15 +1122,15 @@ void read_dir(service_conn_t afcFd, afc_connection* afc_conn_p, const char* dir,
         }
     }
     AFCKeyValueClose(afc_dict_p);
-	
-	if (not_dir) {
-	    NSLogOut(@"%@", [NSString stringWithUTF8String:dir]);
-	} else {
-		NSLogOut(@"%@/", [NSString stringWithUTF8String:dir]);
-	}
 
     if (not_dir) {
-    	if (callback) (*callback)(afc_conn_p, dir, not_dir);
+        NSLogOut(@"%@", [NSString stringWithUTF8String:dir]);
+    } else {
+        NSLogOut(@"%@/", [NSString stringWithUTF8String:dir]);
+    }
+
+    if (not_dir) {
+        if (callback) (*callback)(afc_conn_p, dir, not_dir);
         return;
     }
 
@@ -1192,9 +1192,9 @@ service_conn_t start_house_arrest_service(AMDeviceRef device) {
     return houseFd;
 }
 
-char* get_filename_from_path(char* path)
+char const* get_filename_from_path(char const* path)
 {
-    char *ptr = path + strlen(path);
+    char const*ptr = path + strlen(path);
     while (ptr > path)
     {
         if (*ptr == '/')
@@ -1208,7 +1208,7 @@ char* get_filename_from_path(char* path)
     return ptr+1;
 }
 
-void* read_file_to_memory(char * path, size_t* file_size)
+void* read_file_to_memory(char const * path, size_t* file_size)
 {
     struct stat buf;
     int err = stat(path, &buf);
@@ -1266,7 +1266,7 @@ int app_exists(AMDeviceRef device)
     check_error(AMDeviceStopSession(device));
     check_error(AMDeviceDisconnect(device));
     if (appExists)
-    	return 0;
+        return 0;
     return -1;
 }
 
@@ -1276,13 +1276,13 @@ void list_bundle_id(AMDeviceRef device)
     assert(AMDeviceIsPaired(device));
     check_error(AMDeviceValidatePairing(device));
     check_error(AMDeviceStartSession(device));
-    
+
     NSArray *a = [NSArray arrayWithObjects:@"CFBundleIdentifier", nil];
     NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"];
     CFDictionaryRef options = (CFDictionaryRef)optionsDict;
     CFDictionaryRef result = nil;
     check_error(AMDeviceLookupApplications(device, options, &result));
-    
+
     CFIndex count;
     count = CFDictionaryGetCount(result);
     const void *keys[count];
@@ -1290,7 +1290,7 @@ void list_bundle_id(AMDeviceRef device)
     for(int i = 0; i < count; ++i) {
         NSLogOut(@"%@", (CFStringRef)keys[i]);
     }
-    
+
     check_error(AMDeviceStopSession(device));
     check_error(AMDeviceDisconnect(device));
 }
@@ -1304,35 +1304,35 @@ void copy_file_callback(afc_connection* afc_conn_p, const char *name,int file)
     if (*local_name=='\0') return;
 
     if (file) {
-	afc_file_ref fref;
-	int err = AFCFileRefOpen(afc_conn_p,name,1,&fref);
+    afc_file_ref fref;
+    int err = AFCFileRefOpen(afc_conn_p,name,1,&fref);
 
-	if (err) {
-	    fprintf(stderr,"AFCFileRefOpen(\"%s\") failed: %d\n",name,err);
-	    return;
-	}
+    if (err) {
+        fprintf(stderr,"AFCFileRefOpen(\"%s\") failed: %d\n",name,err);
+        return;
+    }
 
-	FILE *fp = fopen(local_name,"w");
+    FILE *fp = fopen(local_name,"w");
 
-	if (fp==NULL) {
-	    fprintf(stderr,"fopen(\"%s\",\"w\") failer: %s\n",local_name,strerror(errno));
-	    AFCFileRefClose(afc_conn_p,fref);
-	    return;
-	}
+    if (fp==NULL) {
+        fprintf(stderr,"fopen(\"%s\",\"w\") failer: %s\n",local_name,strerror(errno));
+        AFCFileRefClose(afc_conn_p,fref);
+        return;
+    }
 
-	char buf[4096];
-	size_t sz=sizeof(buf);
+    char buf[4096];
+    size_t sz=sizeof(buf);
 
-	while (AFCFileRefRead(afc_conn_p,fref,buf,&sz)==0 && sz) {
-	    fwrite(buf,sz,1,fp);
-	    sz = sizeof(buf);
-	}
+    while (AFCFileRefRead(afc_conn_p,fref,buf,&sz)==0 && sz) {
+        fwrite(buf,sz,1,fp);
+        sz = sizeof(buf);
+    }
 
-	AFCFileRefClose(afc_conn_p,fref);
-	fclose(fp);
+    AFCFileRefClose(afc_conn_p,fref);
+    fclose(fp);
     } else {
-	if (mkdir(local_name,0777) && errno!=EEXIST)
-	    fprintf(stderr,"mkdir(\"%s\") failed: %s\n",local_name,strerror(errno));
+    if (mkdir(local_name,0777) && errno!=EEXIST)
+        fprintf(stderr,"mkdir(\"%s\") failed: %s\n",local_name,strerror(errno));
     }
 }
 
@@ -1341,29 +1341,29 @@ void download_tree(AMDeviceRef device)
     service_conn_t houseFd = start_house_arrest_service(device);
     afc_connection* afc_conn_p = NULL;
     char *dirname = NULL;
-    
-	list_root = list_root? list_root : "/";
-	target_filename = target_filename? target_filename : ".";
-	 
+
+    list_root = list_root? list_root : "/";
+    target_filename = target_filename? target_filename : ".";
+
     NSString* targetPath = [NSString pathWithComponents:@[ @(target_filename), @(list_root)] ];
     mkdirp([targetPath stringByDeletingLastPathComponent]);
 
     if (AFCConnectionOpen(houseFd, 0, &afc_conn_p) == 0)  do {
 
-	if (target_filename) {
-	    dirname = strdup(target_filename);
-	    mkdirp(@(dirname));
-	    if (mkdir(dirname,0777) && errno!=EEXIST) {
-		fprintf(stderr,"mkdir(\"%s\") failed: %s\n",dirname,strerror(errno));
-		break;
-	    }
-	    if (chdir(dirname)) {
-		fprintf(stderr,"chdir(\"%s\") failed: %s\n",dirname,strerror(errno));
-		break;
-	    }
-	}
+    if (target_filename) {
+        dirname = strdup(target_filename);
+        mkdirp(@(dirname));
+        if (mkdir(dirname,0777) && errno!=EEXIST) {
+        fprintf(stderr,"mkdir(\"%s\") failed: %s\n",dirname,strerror(errno));
+        break;
+        }
+        if (chdir(dirname)) {
+        fprintf(stderr,"chdir(\"%s\") failed: %s\n",dirname,strerror(errno));
+        break;
+        }
+    }
 
-	read_dir(houseFd, afc_conn_p, list_root, copy_file_callback);
+    read_dir(houseFd, afc_conn_p, list_root, copy_file_callback);
 
     } while(0);
 
@@ -1371,10 +1371,12 @@ void download_tree(AMDeviceRef device)
     if (afc_conn_p) AFCConnectionClose(afc_conn_p);
 }
 
-void upload_file(AMDeviceRef device) {
-    service_conn_t houseFd = start_house_arrest_service(device);
+void upload_dir(AMDeviceRef device, afc_connection* afc_conn_p, NSString* source, NSString* destination);
+void upload_single_file(AMDeviceRef device, afc_connection* afc_conn_p, NSString* sourcePath, NSString* destinationPath);
 
-    afc_file_ref file_ref;
+void upload_file(AMDeviceRef device)
+{
+    service_conn_t houseFd = start_house_arrest_service(device);
 
     afc_connection afc_conn;
     afc_connection* afc_conn_p = &afc_conn;
@@ -1387,44 +1389,82 @@ void upload_file(AMDeviceRef device) {
         target_filename = get_filename_from_path(upload_pathname);
     }
 
+    NSString* sourcePath = [NSString stringWithUTF8String: upload_pathname];
+    NSString* destinationPath = [NSString stringWithUTF8String: target_filename];
+
+    BOOL isDir;
+    bool exists = [[NSFileManager defaultManager] fileExistsAtPath: sourcePath isDirectory: &isDir];
+    if (!exists)
+    {
+        on_error(@"Could not find file: %s", upload_pathname);
+    }
+    else if (isDir)
+    {
+        upload_dir(device, afc_conn_p, sourcePath, destinationPath);
+    }
+    else
+    {
+        upload_single_file(device, afc_conn_p, sourcePath, destinationPath);
+    }
+    assert(AFCConnectionClose(afc_conn_p) == 0);
+}
+
+void upload_single_file(AMDeviceRef device, afc_connection* afc_conn_p, NSString* sourcePath, NSString* destinationPath) {
+
+    afc_file_ref file_ref;
+
+    //        read_dir(houseFd, NULL, "/", NULL);
+
     size_t file_size;
-    void* file_content = read_file_to_memory(upload_pathname, &file_size);
+    void* file_content = read_file_to_memory([sourcePath fileSystemRepresentation], &file_size);
 
     if (!file_content)
     {
-        on_error(@"Could not open file: %@", [NSString stringWithUTF8String:upload_pathname]);
+        on_error(@"Could not open file: %@", sourcePath);
     }
 
     // Make sure the directory was created
     {
-        char *dirpath = strdup(target_filename);
-        char *c = dirpath, *lastSlash = dirpath;
-        while(*c) {
-            if(*c == '/') {
-                lastSlash = c;
-            }
-            c++;
-        }
-        *lastSlash = '\0';
-        check_error(AFCDirectoryCreate(afc_conn_p, dirpath));
+        NSString *dirpath = [destinationPath stringByDeletingLastPathComponent];
+        check_error(AFCDirectoryCreate(afc_conn_p, [dirpath fileSystemRepresentation]));
     }
 
 
-    int ret = AFCFileRefOpen(afc_conn_p, target_filename, 3, &file_ref);
+    int ret = AFCFileRefOpen(afc_conn_p, [destinationPath fileSystemRepresentation], 3, &file_ref);
     if (ret == 0x000a) {
-        on_error(@"Cannot write to %@. Permission error.", [NSString stringWithUTF8String:target_filename]);
+        on_error(@"Cannot write to %@. Permission error.", destinationPath);
     }
     if (ret == 0x0009) {
-        on_error(@"Target %@ is a directory.", [NSString stringWithUTF8String:target_filename]);
+        on_error(@"Target %@ is a directory.", destinationPath);
     }
     assert(ret == 0);
     assert(AFCFileRefWrite(afc_conn_p, file_ref, file_content, file_size) == 0);
     assert(AFCFileRefClose(afc_conn_p, file_ref) == 0);
-    assert(AFCConnectionClose(afc_conn_p) == 0);
 
     free(file_content);
 }
 
+void upload_dir(AMDeviceRef device, afc_connection* afc_conn_p, NSString* source, NSString* destination)
+{
+    check_error(AFCDirectoryCreate(afc_conn_p, [destination fileSystemRepresentation]));
+    destination = [destination copy];
+    for (NSString* item in [[NSFileManager defaultManager] contentsOfDirectoryAtPath: source error: nil])
+    {
+        NSString* sourcePath = [source stringByAppendingPathComponent: item];
+        NSString* destinationPath = [destination stringByAppendingPathComponent: item];
+        BOOL isDir;
+        [[NSFileManager defaultManager] fileExistsAtPath: sourcePath isDirectory: &isDir];
+        if (isDir)
+        {
+            upload_dir(device, afc_conn_p, sourcePath, destinationPath);
+        }
+        else
+        {
+            upload_single_file(device, afc_conn_p, sourcePath, destinationPath);
+        }
+    }
+}
+
 void make_directory(AMDeviceRef device) {
     service_conn_t houseFd = start_house_arrest_service(device);
 
@@ -1482,12 +1522,12 @@ void uninstall_app(AMDeviceRef device) {
 }
 
 void handle_device(AMDeviceRef device) {
-	NSLogVerbose(@"Already found device? %d", found_device);
+    NSLogVerbose(@"Already found device? %d", found_device);
 
     CFStringRef found_device_id = AMDeviceCopyDeviceIdentifier(device),
                 device_full_name = get_device_full_name(device),
                 device_interface_name = get_device_interface_name(device);
-                
+
     if (detect_only) {
         NSLogOut(@"[....] Found %@ connected through %@.", device_full_name, device_interface_name);
         found_device = true;
@@ -1515,7 +1555,7 @@ void handle_device(AMDeviceRef device) {
         } else if (strcmp("upload", command) == 0) {
             upload_file(device);
         } else if (strcmp("download", command) == 0) {
-            download_tree(device);    
+            download_tree(device);
         } else if (strcmp("mkdir", command) == 0) {
             make_directory(device);
         } else if (strcmp("rm", command) == 0) {
@@ -1636,17 +1676,17 @@ void device_callback(struct am_device_notification_callback_info *info, void *ar
     switch (info->msg) {
         case ADNCI_MSG_CONNECTED:
             if(device_id != NULL || !debug || AMDeviceGetInterfaceType(info->dev) != 2) {
-				if (no_wifi && AMDeviceGetInterfaceType(info->dev) == 2)
-				{
-				    NSLogVerbose(@"Skipping wifi device (type: %d)", AMDeviceGetInterfaceType(info->dev));
-				}
-				else
-				{
-				    NSLogVerbose(@"Handling device type: %d", AMDeviceGetInterfaceType(info->dev));
-				    handle_device(info->dev);
-				}
+        if (no_wifi && AMDeviceGetInterfaceType(info->dev) == 2)
+                {
+                    NSLogVerbose(@"Skipping wifi device (type: %d)", AMDeviceGetInterfaceType(info->dev));
+                }
+                else
+                {
+                    NSLogVerbose(@"Handling device type: %d", AMDeviceGetInterfaceType(info->dev));
+                    handle_device(info->dev);
+                }
             } else if(best_device_match == NULL) {
-				NSLogVerbose(@"Best device match: %d", AMDeviceGetInterfaceType(info->dev));
+                NSLogVerbose(@"Best device match: %d", AMDeviceGetInterfaceType(info->dev));
                 best_device_match = info->dev;
                 CFRetain(best_device_match);
             }
@@ -1658,7 +1698,7 @@ void device_callback(struct am_device_notification_callback_info *info, void *ar
 void timeout_callback(CFRunLoopTimerRef timer, void *info) {
     if ((!found_device) && (!detect_only))  {
         if(best_device_match != NULL) {
-			NSLogVerbose(@"Handling best device match.");
+            NSLogVerbose(@"Handling best device match.");
             handle_device(best_device_match);
 
             CFRelease(best_device_match);
@@ -1681,8 +1721,8 @@ void timeout_callback(CFRunLoopTimerRef timer, void *info) {
           int mypid = getpid();
           if ((parent != 0) && (parent == mypid) && (child != 0))
           {
-			  NSLogVerbose(@"Timeout. Killing child (%d) tree.", child);
-			  kill_ptree(child, SIGHUP);
+              NSLogVerbose(@"Timeout. Killing child (%d) tree.", child);
+              kill_ptree(child, SIGHUP);
           }
       }
       exit(0);
@@ -1729,12 +1769,12 @@ void show_version() {
 
 int main(int argc, char *argv[]) {
 
-	// create a UUID for tmp purposes
+    // create a UUID for tmp purposes
     CFUUIDRef uuid = CFUUIDCreate(NULL);
     CFStringRef str = CFUUIDCreateString(NULL, uuid);
     CFRelease(uuid);
     tmpUUID = [(NSString*)str autorelease];
-	
+
     static struct option longopts[] = {
         { "debug", no_argument, NULL, 'd' },
         { "id", required_argument, NULL, 'i' },

src/ios-deploy/lldb.py.h

@@ -1,86 +0,0 @@
-"# AUTO-GENERATED - DO NOT MODIFY\n"
-"import lldb\n"
-"import os\n"
-"import sys\n"
-"import shlex\n"
-"\n"
-"def connect_command(debugger, command, result, internal_dict):\n"
-"    # These two are passed in by the script which loads us\n"
-"    connect_url = internal_dict['fruitstrap_connect_url']\n"
-"    error = lldb.SBError()\n"
-"\n"
-"    process = lldb.target.ConnectRemote(lldb.target.GetDebugger().GetListener(), connect_url, None, error)\n"
-"\n"
-"    # Wait for connection to succeed\n"
-"    listener = lldb.target.GetDebugger().GetListener()\n"
-"    listener.StartListeningForEvents(process.GetBroadcaster(), lldb.SBProcess.eBroadcastBitStateChanged)\n"
-"    events = []\n"
-"    state = (process.GetState() or lldb.eStateInvalid)\n"
-"    while state != lldb.eStateConnected:\n"
-"        event = lldb.SBEvent()\n"
-"        if listener.WaitForEvent(1, event):\n"
-"            state = process.GetStateFromEvent(event)\n"
-"            events.append(event)\n"
-"        else:\n"
-"            state = lldb.eStateInvalid\n"
-"\n"
-"    # Add events back to queue, otherwise lldb freezes\n"
-"    for event in events:\n"
-"        listener.AddEvent(event)\n"
-"\n"
-"def run_command(debugger, command, result, internal_dict):\n"
-"    device_app = internal_dict['fruitstrap_device_app']\n"
-"    args = command.split('--',1)\n"
-"    error = lldb.SBError()\n"
-"    lldb.target.modules[0].SetPlatformFileSpec(lldb.SBFileSpec(device_app))\n"
-"    lldb.target.Launch(lldb.SBLaunchInfo(shlex.split(args[1] and args[1] or '{args}')), error)\n"
-"    lockedstr = ': Locked'\n"
-"    if lockedstr in str(error):\n"
-"       print('\\nDevice Locked\\n')\n"
-"       os._exit(254)\n"
-"    else:\n"
-"       print(str(error))\n"
-"\n"
-"def safequit_command(debugger, command, result, internal_dict):\n"
-"    process = lldb.target.process\n"
-"    listener = debugger.GetListener()\n"
-"    listener.StartListeningForEvents(process.GetBroadcaster(), lldb.SBProcess.eBroadcastBitStateChanged | lldb.SBProcess.eBroadcastBitSTDOUT | lldb.SBProcess.eBroadcastBitSTDERR)\n"
-"    event = lldb.SBEvent()\n"
-"    while True:\n"
-"        if listener.WaitForEvent(1, event) and lldb.SBProcess.EventIsProcessEvent(event):\n"
-"            state = lldb.SBProcess.GetStateFromEvent(event)\n"
-"        else:\n"
-"            state = process.GetState()\n"
-"\n"
-"        if state == lldb.eStateRunning:\n"
-"            process.Detach()\n"
-"            os._exit(0)\n"
-"        elif state > lldb.eStateRunning:\n"
-"            os._exit(state)\n"
-"\n"
-"def autoexit_command(debugger, command, result, internal_dict):\n"
-"    process = lldb.target.process\n"
-"    listener = debugger.GetListener()\n"
-"    listener.StartListeningForEvents(process.GetBroadcaster(), lldb.SBProcess.eBroadcastBitStateChanged | lldb.SBProcess.eBroadcastBitSTDOUT | lldb.SBProcess.eBroadcastBitSTDERR)\n"
-"    event = lldb.SBEvent()\n"
-"    while True:\n"
-"        if listener.WaitForEvent(1, event) and lldb.SBProcess.EventIsProcessEvent(event):\n"
-"            state = lldb.SBProcess.GetStateFromEvent(event)\n"
-"        else:\n"
-"            state = process.GetState()\n"
-"\n"
-"        if state == lldb.eStateExited:\n"
-"            os._exit(process.GetExitStatus())\n"
-"        elif state == lldb.eStateStopped:\n"
-"            debugger.HandleCommand('bt')\n"
-"            os._exit({exitcode_app_crash})\n"
-"\n"
-"        stdout = process.GetSTDOUT(1024)\n"
-"        while stdout:\n"
-"            sys.stdout.write(stdout)\n"
-"            stdout = process.GetSTDOUT(1024)\n"
-"\n"
-"        stderr = process.GetSTDERR(1024)\n"
-"        while stderr:\n"
-"            sys.stdout.write(stderr)\n"
-"            stderr = process.GetSTDERR(1024)\n"

src/ios-deploy/version.h

@@ -1 +1 @@
-"1.8.4"
+"1.8.7"

src/scripts/check_reqs.js

@@ -36,6 +36,17 @@ xcode_version.on('close', function (code) {
 		if (ver < XCODEBUILD_MIN_VERSION) {
 		    console.log(util.format('%s : %s. (you have version %s)', TOOL, XCODEBUILD_NOT_FOUND_MESSAGE, ver));
 		}
+		
+		if (os.release() >= '15.0.0') { // print the El Capitan warning
+			console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+			console.log('!!!! WARNING: You are on OS X 10.11 El Capitan, you may need to add the');
+			console.log('!!!! WARNING:   `--unsafe-perm=true` flag when running `npm install`');
+			console.log('!!!! WARNING:   or else it will fail.');
+			console.log('!!!! WARNING: link:');
+			console.log('!!!! WARNING:   https://github.com/phonegap/ios-deploy#os-x-1011-el-capitan');
+			console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
+		}
+		
 	}
 	process.exit(code);
 });

src/scripts/lldb.py

@@ -32,7 +32,10 @@ def run_command(debugger, command, result, internal_dict):
     args = command.split('--',1)
     error = lldb.SBError()
     lldb.target.modules[0].SetPlatformFileSpec(lldb.SBFileSpec(device_app))
-    lldb.target.Launch(lldb.SBLaunchInfo(shlex.split(args[1] and args[1] or '{args}')), error)
+    args_arr = []
+    if len(args) > 1:
+        args_arr = shlex.split(args[1] and args[1] or '{args}')
+    lldb.target.Launch(lldb.SBLaunchInfo(args_arr), error)
     lockedstr = ': Locked'
     if lockedstr in str(error):
        print('\\nDevice Locked\\n')
@@ -42,20 +45,15 @@ def run_command(debugger, command, result, internal_dict):
 
 def safequit_command(debugger, command, result, internal_dict):
     process = lldb.target.process
-    listener = debugger.GetListener()
-    listener.StartListeningForEvents(process.GetBroadcaster(), lldb.SBProcess.eBroadcastBitStateChanged | lldb.SBProcess.eBroadcastBitSTDOUT | lldb.SBProcess.eBroadcastBitSTDERR)
-    event = lldb.SBEvent()
-    while True:
-        if listener.WaitForEvent(1, event) and lldb.SBProcess.EventIsProcessEvent(event):
-            state = lldb.SBProcess.GetStateFromEvent(event)
-        else:
-            state = process.GetState()
-
-        if state == lldb.eStateRunning:
-            process.Detach()
-            os._exit(0)
-        elif state > lldb.eStateRunning:
-            os._exit(state)
+    state = process.GetState()
+    if state == lldb.eStateRunning:
+        process.Detach()
+        os._exit(0)
+    elif state > lldb.eStateRunning:
+        os._exit(state)
+    else:
+        print('\\nApplication has not been launched\\n')
+        os._exit(1)
 
 def autoexit_command(debugger, command, result, internal_dict):
     process = lldb.target.process