atria-soft/ios-deploy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed SIGSEV due to new NSLogOut changes.

Browse Source
This commit is contained in:
Shazron Abdullah 2015-05-18 17:26:48 -07:00
parent ddcb4932ab
commit 84aeaad03b
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ios-deploy.c
View File

@ -18,7 +18,7 @@
#include "MobileDevice.h" #include "MobileDevice.h"
#include "errors.h" #include "errors.h"
#define APP_VERSION "1.7.0" #define APP_VERSION @"1.7.0"
#define PREP_CMDS_PATH "/tmp/fruitstrap-lldb-prep-cmds-" #define PREP_CMDS_PATH "/tmp/fruitstrap-lldb-prep-cmds-"
#define LLDB_SHELL "lldb -s " PREP_CMDS_PATH #define LLDB_SHELL "lldb -s " PREP_CMDS_PATH
/* /*
@ -454,13 +454,8 @@ CFStringRef get_device_full_name(const AMDeviceRef device) {
if (verbose) if (verbose)
{ {
char *devName = MYCFStringCopyUTF8String(device_name); NSLogOut(@"Device Name: %@", device_name);
NSLogOut(@"Device Name: %@\n", devName); NSLogOut(@"Model Name: %@", model_name);
free(devName);
char *mdlName = MYCFStringCopyUTF8String(model_name);
NSLogOut(@"Model Name: %@\n", mdlName);
free(mdlName);
} }
if(device_name != NULL && model_name != NULL) if(device_name != NULL && model_name != NULL)
@ -656,7 +651,7 @@ mach_error_t install_callback(CFDictionaryRef dict, int arg) {
CFStringRef status = CFDictionaryGetValue(dict, CFSTR("Status")); CFStringRef status = CFDictionaryGetValue(dict, CFSTR("Status"));
CFNumberGetValue(CFDictionaryGetValue(dict, CFSTR("PercentComplete")), kCFNumberSInt32Type, &percent); CFNumberGetValue(CFDictionaryGetValue(dict, CFSTR("PercentComplete")), kCFNumberSInt32Type, &percent);
NSLogOut(@"[%3d%%] %@\n", (percent / 2) + 50, status); NSLogOut(@"[%3d%%] %@", (percent / 2) + 50, status);
return 0; return 0;
} }
@ -1011,11 +1006,11 @@ void setup_lldb(AMDeviceRef device, CFURLRef url) {
if(AMDeviceGetInterfaceType(device) == 2) if(AMDeviceGetInterfaceType(device) == 2)
{ {
NSLogOut(@"Cannot debug %@ over %@.\n", device_full_name, device_interface_name); NSLogOut(@"Cannot debug %@ over %@.", device_full_name, device_interface_name);
exit(0); exit(0);
} }
NSLogOut(@"Starting debug of %@ connected through %@...\n", device_full_name, device_interface_name); NSLogOut(@"Starting debug of %@ connected through %@...", device_full_name, device_interface_name);
mount_developer_image(device); // put debugserver on the device mount_developer_image(device); // put debugserver on the device
start_remote_debug_server(device); // start debugserver start_remote_debug_server(device); // start debugserver
@ -1164,7 +1159,7 @@ void read_dir(service_conn_t afcFd, afc_connection* afc_conn_p, const char* dir,
AFCConnectionOpen(afcFd, 0, &afc_conn_p); AFCConnectionOpen(afcFd, 0, &afc_conn_p);
} }
NSLogOut(@"%@\n", dir); NSLogOut(@"%@", [NSString stringWithUTF8String:dir]);
afc_dictionary* afc_dict_p; afc_dictionary* afc_dict_p;
char *key, *val; char *key, *val;
@ -1344,8 +1339,7 @@ void list_bundle_id(AMDeviceRef device)
CFDictionaryGetKeysAndValues(result, keys, NULL); CFDictionaryGetKeysAndValues(result, keys, NULL);
for(int i = 0; i < count; ++i) { for(int i = 0; i < count; ++i) {
CFStringRef test = (CFStringRef)keys[i]; CFStringRef test = (CFStringRef)keys[i];
const char * key = CFStringGetCStringPtr((CFStringRef)keys[i], kCFStringEncodingASCII); NSLogOut(@"%@", (CFStringRef)keys[i]);
NSLogOut(@"%@", key);
} }
check_error(AMDeviceStopSession(device)); check_error(AMDeviceStopSession(device));
@ -1584,7 +1578,7 @@ void handle_device(AMDeviceRef device) {
found_device = true; found_device = true;
} }
NSLogOut(@"[....] Using %@ (%@).", device_full_name, found_device_id); NSLogOut(@"[....] Using %@.", device_full_name);
if (command_only) { if (command_only) {
if (strcmp("list", command) == 0) { if (strcmp("list", command) == 0) {
@ -1697,7 +1691,7 @@ void handle_device(AMDeviceRef device) {
CFRelease(path); CFRelease(path);
CFRelease(options); CFRelease(options);
NSLogOut(@"[100%%] Installed package %@", app_path); NSLogOut(@"[100%%] Installed package %@", [NSString stringWithUTF8String:app_path]);
} }
if (!debug) if (!debug)