generic-library/ios-deploy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace remaining tabs by spaces

Browse Source
This commit is contained in:
Alexis Kofman 2016-04-08 19:47:42 +02:00 committed by Shazron Abdullah
parent c4cd7b4a55
commit 440454fc5a
1 changed files with 105 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
src/ios-deploy/ios-deploy.m
View File

@ -86,7 +86,7 @@ char *device_id = NULL;
char *args = NULL; char *args = NULL;
char *list_root = NULL; char *list_root = NULL;
int _timeout = 0; int _timeout = 0;
int port = 0; // 0 means "dynamically assigned" int port = 0; // 0 means "dynamically assigned"
CFStringRef last_path = NULL; CFStringRef last_path = NULL;
service_conn_t gdbfd; service_conn_t gdbfd;
pid_t parent = 0; pid_t parent = 0;
@ -122,8 +122,8 @@ void on_error(NSString* format, ...)
NSString* str = [[[NSString alloc] initWithFormat:format arguments:valist] autorelease]; NSString* str = [[[NSString alloc] initWithFormat:format arguments:valist] autorelease];
va_end(valist); va_end(valist);
NSLog(@"[ !! ] %@", str); NSLog(@"[ !! ] %@", str);
exit(exitcode_error); exit(exitcode_error);
} }
@ -135,7 +135,7 @@ void on_sys_error(NSString* format, ...) {
va_start(valist, format); va_start(valist, format);
NSString* str = [[[NSString alloc] initWithFormat:format arguments:valist] autorelease]; NSString* str = [[[NSString alloc] initWithFormat:format arguments:valist] autorelease];
va_end(valist); va_end(valist);
on_error(@"%@ : %@", str, [NSString stringWithUTF8String:errstr]); on_error(@"%@ : %@", str, [NSString stringWithUTF8String:errstr]);
} }
@ -147,25 +147,25 @@ void __NSLogOut(NSString* format, va_list valist) {
void NSLogOut(NSString* format, ...) { void NSLogOut(NSString* format, ...) {
va_list valist; va_list valist;
va_start(valist, format); va_start(valist, format);
__NSLogOut(format, valist); __NSLogOut(format, valist);
va_end(valist); va_end(valist);
} }
void NSLogVerbose(NSString* format, ...) { void NSLogVerbose(NSString* format, ...) {
if (verbose) { if (verbose) {
va_list valist; va_list valist;
va_start(valist, format); va_start(valist, format);
__NSLogOut(format, valist); __NSLogOut(format, valist);
va_end(valist); va_end(valist);
} }
} }
BOOL mkdirp(NSString* path) { BOOL mkdirp(NSString* path) {
NSError* error = nil; NSError* error = nil;
BOOL success = [[NSFileManager defaultManager] createDirectoryAtPath:path BOOL success = [[NSFileManager defaultManager] createDirectoryAtPath:path
withIntermediateDirectories:YES withIntermediateDirectories:YES
attributes:nil attributes:nil
error:&error]; error:&error];
return success; return success;
} }
@ -397,8 +397,8 @@ CFStringRef get_device_full_name(const AMDeviceRef device) {
device_name = AMDeviceCopyValue(device, 0, CFSTR("DeviceName")), device_name = AMDeviceCopyValue(device, 0, CFSTR("DeviceName")),
model_name = get_device_hardware_name(device); model_name = get_device_hardware_name(device);
NSLogVerbose(@"Device Name: %@", device_name); NSLogVerbose(@"Device Name: %@", device_name);
NSLogVerbose(@"Model Name: %@", model_name); NSLogVerbose(@"Model Name: %@", model_name);
if(device_name != NULL && model_name != NULL) 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 image_path = copy_developer_disk_image_path(device);
CFStringRef sig_path = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@.signature"), image_path); CFStringRef sig_path = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@.signature"), image_path);
NSLogVerbose(@"Device support path: %@", ds_path); NSLogVerbose(@"Device support path: %@", ds_path);
NSLogVerbose(@"Developer disk image: %@", image_path); NSLogVerbose(@"Developer disk image: %@", image_path);
CFRelease(ds_path); CFRelease(ds_path);
FILE* sig = fopen(CFStringGetCStringPtr(sig_path, kCFStringEncodingMacRoman), "rb"); FILE* sig = fopen(CFStringGetCStringPtr(sig_path, kCFStringEncodingMacRoman), "rb");
void *sig_buf = malloc(128); void *sig_buf = malloc(128);
@ -599,7 +599,7 @@ CFURLRef copy_device_app_url(AMDeviceRef device, CFStringRef identifier) {
CFDictionaryRef result = nil; CFDictionaryRef result = nil;
NSArray *a = [NSArray arrayWithObjects: NSArray *a = [NSArray arrayWithObjects:
@"CFBundleIdentifier", // absolute must @"CFBundleIdentifier", // absolute must
@"ApplicationDSID", @"ApplicationDSID",
@"ApplicationType", @"ApplicationType",
@"CFBundleExecutable", @"CFBundleExecutable",
@ -624,7 +624,7 @@ CFURLRef copy_device_app_url(AMDeviceRef device, CFStringRef identifier) {
nil]; nil];
NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"]; NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"];
CFDictionaryRef options = (CFDictionaryRef)optionsDict; CFDictionaryRef options = (CFDictionaryRef)optionsDict;
check_error(AMDeviceLookupApplications(device, options, &result)); 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); CFURLRef plist_url = CFURLCreateCopyAppendingPathComponent(NULL, disk_app_url, CFSTR("Info.plist"), false);
CFReadStreamRef plist_stream = CFReadStreamCreateWithFile(NULL, plist_url); CFReadStreamRef plist_stream = CFReadStreamCreateWithFile(NULL, plist_url);
if (!CFReadStreamOpen(plist_stream)) { 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); CFPropertyListRef plist = CFPropertyListCreateWithStream(NULL, plist_stream, 0, kCFPropertyListImmutable, NULL, NULL);
CFStringRef bundle_identifier = CFRetain(CFDictionaryGetValue(plist, CFSTR("CFBundleIdentifier"))); CFStringRef bundle_identifier = CFRetain(CFDictionaryGetValue(plist, CFSTR("CFBundleIdentifier")));
CFReadStreamClose(plist_stream); 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); CFStringFindAndReplace(cmds, CFSTR("{disk_container}"), disk_container_path, range, 0);
NSString* python_file_path = [NSString stringWithFormat:@"/tmp/%@/fruitstrap_", tmpUUID]; NSString* python_file_path = [NSString stringWithFormat:@"/tmp/%@/fruitstrap_", tmpUUID];
mkdirp(python_file_path); mkdirp(python_file_path);
NSString* python_command = @"fruitstrap_"; NSString* python_command = @"fruitstrap_";
if(device_id != NULL) { if(device_id != NULL) {
python_file_path = [python_file_path 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_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); CFStringFindAndReplace(cmds, CFSTR("{python_command}"), (CFStringRef)python_command, range, 0);
range.length = CFStringGetLength(cmds); 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]; NSString* prep_cmds_path = [NSString stringWithFormat:PREP_CMDS_PATH, tmpUUID];
if(device_id != NULL) { if(device_id != NULL) {
prep_cmds_path = [prep_cmds_path stringByAppendingString:[NSString stringWithUTF8String:device_id]]; prep_cmds_path = [prep_cmds_path stringByAppendingString:[NSString stringWithUTF8String:device_id]];
} }
FILE *out = fopen([prep_cmds_path UTF8String], "w"); FILE *out = fopen([prep_cmds_path UTF8String], "w");
fwrite(CFDataGetBytePtr(cmds_data), CFDataGetLength(cmds_data), 1, out); fwrite(CFDataGetBytePtr(cmds_data), CFDataGetLength(cmds_data), 1, out);
// Write additional commands based on mode we're running in // 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); setup_dummy_pipe_on_stdin(pfd);
NSString* lldb_shell; NSString* lldb_shell;
NSString* prep_cmds = [NSString stringWithFormat:PREP_CMDS_PATH, tmpUUID]; NSString* prep_cmds = [NSString stringWithFormat:PREP_CMDS_PATH, tmpUUID];
lldb_shell = [NSString stringWithFormat:LLDB_SHELL, prep_cmds]; lldb_shell = [NSString stringWithFormat:LLDB_SHELL, prep_cmds];
if(device_id != NULL) { 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 int status = system([lldb_shell UTF8String]); // launch lldb
if (status == -1) 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* 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) { 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 int status = system([lldb_shell UTF8String]); // launch lldb
if (status == -1) 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); AFCKeyValueClose(afc_dict_p);
if (not_dir) {
NSLogOut(@"%@", [NSString stringWithUTF8String:dir]);
} else {
NSLogOut(@"%@/", [NSString stringWithUTF8String:dir]);
}
if (not_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; return;
} }
@ -1266,7 +1266,7 @@ int app_exists(AMDeviceRef device)
check_error(AMDeviceStopSession(device)); check_error(AMDeviceStopSession(device));
check_error(AMDeviceDisconnect(device)); check_error(AMDeviceDisconnect(device));
if (appExists) if (appExists)
return 0; return 0;
return -1; return -1;
} }
@ -1276,13 +1276,13 @@ void list_bundle_id(AMDeviceRef device)
assert(AMDeviceIsPaired(device)); assert(AMDeviceIsPaired(device));
check_error(AMDeviceValidatePairing(device)); check_error(AMDeviceValidatePairing(device));
check_error(AMDeviceStartSession(device)); check_error(AMDeviceStartSession(device));
NSArray *a = [NSArray arrayWithObjects:@"CFBundleIdentifier", nil]; NSArray *a = [NSArray arrayWithObjects:@"CFBundleIdentifier", nil];
NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"]; NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"];
CFDictionaryRef options = (CFDictionaryRef)optionsDict; CFDictionaryRef options = (CFDictionaryRef)optionsDict;
CFDictionaryRef result = nil; CFDictionaryRef result = nil;
check_error(AMDeviceLookupApplications(device, options, &result)); check_error(AMDeviceLookupApplications(device, options, &result));
CFIndex count; CFIndex count;
count = CFDictionaryGetCount(result); count = CFDictionaryGetCount(result);
const void *keys[count]; const void *keys[count];
@ -1290,7 +1290,7 @@ void list_bundle_id(AMDeviceRef device)
for(int i = 0; i < count; ++i) { for(int i = 0; i < count; ++i) {
NSLogOut(@"%@", (CFStringRef)keys[i]); NSLogOut(@"%@", (CFStringRef)keys[i]);
} }
check_error(AMDeviceStopSession(device)); check_error(AMDeviceStopSession(device));
check_error(AMDeviceDisconnect(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 (*local_name=='\0') return;
if (file) { if (file) {
afc_file_ref fref; afc_file_ref fref;
int err = AFCFileRefOpen(afc_conn_p,name,1,&fref); int err = AFCFileRefOpen(afc_conn_p,name,1,&fref);
if (err) { if (err) {
fprintf(stderr,"AFCFileRefOpen(\"%s\") failed: %d\n",name,err); fprintf(stderr,"AFCFileRefOpen(\"%s\") failed: %d\n",name,err);
return; return;
} }
FILE *fp = fopen(local_name,"w"); FILE *fp = fopen(local_name,"w");
if (fp==NULL) { if (fp==NULL) {
fprintf(stderr,"fopen(\"%s\",\"w\") failer: %s\n",local_name,strerror(errno)); fprintf(stderr,"fopen(\"%s\",\"w\") failer: %s\n",local_name,strerror(errno));
AFCFileRefClose(afc_conn_p,fref); AFCFileRefClose(afc_conn_p,fref);
return; return;
} }
char buf[4096]; char buf[4096];
size_t sz=sizeof(buf); size_t sz=sizeof(buf);
while (AFCFileRefRead(afc_conn_p,fref,buf,&sz)==0 && sz) { while (AFCFileRefRead(afc_conn_p,fref,buf,&sz)==0 && sz) {
fwrite(buf,sz,1,fp); fwrite(buf,sz,1,fp);
sz = sizeof(buf); sz = sizeof(buf);
} }
AFCFileRefClose(afc_conn_p,fref); AFCFileRefClose(afc_conn_p,fref);
fclose(fp); fclose(fp);
} else { } else {
if (mkdir(local_name,0777) && errno!=EEXIST) if (mkdir(local_name,0777) && errno!=EEXIST)
fprintf(stderr,"mkdir(\"%s\") failed: %s\n",local_name,strerror(errno)); 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); service_conn_t houseFd = start_house_arrest_service(device);
afc_connection* afc_conn_p = NULL; afc_connection* afc_conn_p = NULL;
char *dirname = NULL; char *dirname = NULL;
list_root = list_root? list_root : "/"; list_root = list_root? list_root : "/";
target_filename = target_filename? target_filename : "."; target_filename = target_filename? target_filename : ".";
NSString* targetPath = [NSString pathWithComponents:@[ @(target_filename), @(list_root)] ]; NSString* targetPath = [NSString pathWithComponents:@[ @(target_filename), @(list_root)] ];
mkdirp([targetPath stringByDeletingLastPathComponent]); mkdirp([targetPath stringByDeletingLastPathComponent]);
if (AFCConnectionOpen(houseFd, 0, &afc_conn_p) == 0) do { if (AFCConnectionOpen(houseFd, 0, &afc_conn_p) == 0) do {
if (target_filename) { if (target_filename) {
dirname = strdup(target_filename); dirname = strdup(target_filename);
mkdirp(@(dirname)); mkdirp(@(dirname));
if (mkdir(dirname,0777) && errno!=EEXIST) { if (mkdir(dirname,0777) && errno!=EEXIST) {
fprintf(stderr,"mkdir(\"%s\") failed: %s\n",dirname,strerror(errno)); fprintf(stderr,"mkdir(\"%s\") failed: %s\n",dirname,strerror(errno));
break; break;
} }
if (chdir(dirname)) { if (chdir(dirname)) {
fprintf(stderr,"chdir(\"%s\") failed: %s\n",dirname,strerror(errno)); fprintf(stderr,"chdir(\"%s\") failed: %s\n",dirname,strerror(errno));
break; 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); } while(0);
@ -1522,12 +1522,12 @@ void uninstall_app(AMDeviceRef device) {
} }
void handle_device(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), CFStringRef found_device_id = AMDeviceCopyDeviceIdentifier(device),
device_full_name = get_device_full_name(device), device_full_name = get_device_full_name(device),
device_interface_name = get_device_interface_name(device); device_interface_name = get_device_interface_name(device);
if (detect_only) { if (detect_only) {
NSLogOut(@"[....] Found %@ connected through %@.", device_full_name, device_interface_name); NSLogOut(@"[....] Found %@ connected through %@.", device_full_name, device_interface_name);
found_device = true; found_device = true;
@ -1555,7 +1555,7 @@ void handle_device(AMDeviceRef device) {
} else if (strcmp("upload", command) == 0) { } else if (strcmp("upload", command) == 0) {
upload_file(device); upload_file(device);
} else if (strcmp("download", command) == 0) { } else if (strcmp("download", command) == 0) {
download_tree(device); download_tree(device);
} else if (strcmp("mkdir", command) == 0) { } else if (strcmp("mkdir", command) == 0) {
make_directory(device); make_directory(device);
} else if (strcmp("rm", command) == 0) { } else if (strcmp("rm", command) == 0) {
@ -1676,17 +1676,17 @@ void device_callback(struct am_device_notification_callback_info *info, void *ar
switch (info->msg) { switch (info->msg) {
case ADNCI_MSG_CONNECTED: case ADNCI_MSG_CONNECTED:
if(device_id != NULL || !debug || AMDeviceGetInterfaceType(info->dev) != 2) { if(device_id != NULL || !debug || AMDeviceGetInterfaceType(info->dev) != 2) {
if (no_wifi && AMDeviceGetInterfaceType(info->dev) == 2) if (no_wifi && AMDeviceGetInterfaceType(info->dev) == 2)
{ {
NSLogVerbose(@"Skipping wifi device (type: %d)", AMDeviceGetInterfaceType(info->dev)); NSLogVerbose(@"Skipping wifi device (type: %d)", AMDeviceGetInterfaceType(info->dev));
} }
else else
{ {
NSLogVerbose(@"Handling device type: %d", AMDeviceGetInterfaceType(info->dev)); NSLogVerbose(@"Handling device type: %d", AMDeviceGetInterfaceType(info->dev));
handle_device(info->dev); handle_device(info->dev);
} }
} else if(best_device_match == NULL) { } 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; best_device_match = info->dev;
CFRetain(best_device_match); CFRetain(best_device_match);
} }
@ -1698,7 +1698,7 @@ void device_callback(struct am_device_notification_callback_info *info, void *ar
void timeout_callback(CFRunLoopTimerRef timer, void *info) { void timeout_callback(CFRunLoopTimerRef timer, void *info) {
if ((!found_device) && (!detect_only)) { if ((!found_device) && (!detect_only)) {
if(best_device_match != NULL) { if(best_device_match != NULL) {
NSLogVerbose(@"Handling best device match."); NSLogVerbose(@"Handling best device match.");
handle_device(best_device_match); handle_device(best_device_match);
CFRelease(best_device_match); CFRelease(best_device_match);
@ -1721,8 +1721,8 @@ void timeout_callback(CFRunLoopTimerRef timer, void *info) {
int mypid = getpid(); int mypid = getpid();
if ((parent != 0) && (parent == mypid) && (child != 0)) if ((parent != 0) && (parent == mypid) && (child != 0))
{ {
NSLogVerbose(@"Timeout. Killing child (%d) tree.", child); NSLogVerbose(@"Timeout. Killing child (%d) tree.", child);
kill_ptree(child, SIGHUP); kill_ptree(child, SIGHUP);
} }
} }
exit(0); exit(0);
@ -1769,12 +1769,12 @@ void show_version() {
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
// create a UUID for tmp purposes // create a UUID for tmp purposes
CFUUIDRef uuid = CFUUIDCreate(NULL); CFUUIDRef uuid = CFUUIDCreate(NULL);
CFStringRef str = CFUUIDCreateString(NULL, uuid); CFStringRef str = CFUUIDCreateString(NULL, uuid);
CFRelease(uuid); CFRelease(uuid);
tmpUUID = [(NSString*)str autorelease]; tmpUUID = [(NSString*)str autorelease];
static struct option longopts[] = { static struct option longopts[] = {
{ "debug", no_argument, NULL, 'd' }, { "debug", no_argument, NULL, 'd' },
{ "id", required_argument, NULL, 'i' }, { "id", required_argument, NULL, 'i' },