From 2b05e48cb4a90dfc94ff584124f08e431398bb1a Mon Sep 17 00:00:00 2001 From: Matt Colyer Date: Mon, 1 Sep 2008 15:04:31 -0700 Subject: Enforce a modified kr style. Use "make indent" from now on before committing. --- src/AFC.c | 597 +++++++++++++++++++++++++++++++++++--------------------------- 1 file changed, 339 insertions(+), 258 deletions(-) (limited to 'src/AFC.c') diff --git a/src/AFC.c b/src/AFC.c index b475a06..42ada68 100644 --- a/src/AFC.c +++ b/src/AFC.c @@ -33,10 +33,12 @@ extern int debug; * * @param client The AFC client connection to lock */ -static void afc_lock(iphone_afc_client_t client) { - if (debug) fprintf(stderr, "Locked\n"); +static void afc_lock(iphone_afc_client_t client) +{ + if (debug) + fprintf(stderr, "Locked\n"); while (client->lock) { - usleep(500); // they say it's obsolete, but whatever + usleep(500); // they say it's obsolete, but whatever } client->lock = 1; } @@ -45,9 +47,11 @@ static void afc_lock(iphone_afc_client_t client) { * * @param client The AFC */ -static void afc_unlock(iphone_afc_client_t client) { // just to be pretty - if (debug) fprintf(stderr, "Unlocked\n"); - client->lock = 0; +static void afc_unlock(iphone_afc_client_t client) +{ // just to be pretty + if (debug) + fprintf(stderr, "Unlocked\n"); + client->lock = 0; } /** Makes a connection to the AFC service on the phone. @@ -58,22 +62,23 @@ static void afc_unlock(iphone_afc_client_t client) { // just to be pretty * * @return A handle to the newly-connected client or NULL upon error. */ -iphone_error_t iphone_afc_new_client ( iphone_device_t device, int src_port, int dst_port, iphone_afc_client_t *client ) { +iphone_error_t iphone_afc_new_client(iphone_device_t device, int src_port, int dst_port, iphone_afc_client_t * client) +{ int ret = IPHONE_E_SUCCESS; - iphone_afc_client_t client_loc = (iphone_afc_client_t)malloc(sizeof(struct iphone_afc_client_int)); - - if (!device) return IPHONE_E_INVALID_ARG; - + iphone_afc_client_t client_loc = (iphone_afc_client_t) malloc(sizeof(struct iphone_afc_client_int)); + + if (!device) + return IPHONE_E_INVALID_ARG; + // Attempt connection client_loc->connection = NULL; - ret = iphone_mux_new_client(device, src_port, dst_port,&client_loc->connection); + ret = iphone_mux_new_client(device, src_port, dst_port, &client_loc->connection); if (IPHONE_E_SUCCESS != ret || !client_loc->connection) { free(client_loc); - return ret; + return ret; } - // Allocate a packet - client_loc->afc_packet = (AFCPacket*)malloc(sizeof(AFCPacket)); + client_loc->afc_packet = (AFCPacket *) malloc(sizeof(AFCPacket)); if (!client_loc->afc_packet) { iphone_mux_free_client(client_loc->connection); free(client_loc); @@ -100,10 +105,11 @@ iphone_error_t iphone_afc_new_client ( iphone_device_t device, int src_port, int * * @param client The client to disconnect. */ -iphone_error_t iphone_afc_free_client ( iphone_afc_client_t client ) { +iphone_error_t iphone_afc_free_client(iphone_afc_client_t client) +{ if (!client || !client->connection || !client->afc_packet) return IPHONE_E_INVALID_ARG; - + iphone_mux_free_client(client->connection); free(client->afc_packet); free(client); @@ -124,65 +130,78 @@ iphone_error_t iphone_afc_free_client ( iphone_afc_client_t client ) { * reason is that if you set them to different values, it indicates * you want to send the data as two packets. */ -static int dispatch_AFC_packet(iphone_afc_client_t client, const char *data, int length) { +static int dispatch_AFC_packet(iphone_afc_client_t client, const char *data, int length) +{ int bytes = 0, offset = 0; - char *buffer; + char *buffer; + + if (!client || !client->connection || !client->afc_packet) + return 0; + if (!data || !length) + length = 0; - if (!client || !client->connection || !client->afc_packet) return 0; - if (!data || !length) length = 0; - client->afc_packet->packet_num++; if (!client->afc_packet->entire_length) { client->afc_packet->entire_length = (length) ? sizeof(AFCPacket) + length + 1 : sizeof(AFCPacket); client->afc_packet->this_length = client->afc_packet->entire_length; } - if (!client->afc_packet->this_length){ + if (!client->afc_packet->this_length) { client->afc_packet->this_length = sizeof(AFCPacket); } - - // We want to send two segments; buffer+sizeof(AFCPacket) to this_length is the parameters + // We want to send two segments; buffer+sizeof(AFCPacket) to + // this_length is the parameters // And everything beyond that is the next packet. (for writing) if (client->afc_packet->this_length != client->afc_packet->entire_length) { - buffer = (char*)malloc(client->afc_packet->this_length); - memcpy(buffer, (char*)client->afc_packet, sizeof(AFCPacket)); + buffer = (char *) malloc(client->afc_packet->this_length); + memcpy(buffer, (char *) client->afc_packet, sizeof(AFCPacket)); offset = client->afc_packet->this_length - sizeof(AFCPacket); - - if (debug) fprintf(stderr, "dispatch_AFC_packet: Offset: %i\n", offset); + + if (debug) + fprintf(stderr, "dispatch_AFC_packet: Offset: %i\n", offset); if ((length) < (client->afc_packet->entire_length - client->afc_packet->this_length)) { - if (debug){ + if (debug) { fprintf(stderr, "dispatch_AFC_packet: Length did not resemble what it was supposed"); - fprintf(stderr, "to based on the packet.\n"); - fprintf(stderr, "length minus offset: %i\n", length-offset); - fprintf(stderr, "rest of packet: %i\n", client->afc_packet->entire_length - client->afc_packet->this_length); + fprintf(stderr, "to based on the packet.\n"); + fprintf(stderr, "length minus offset: %i\n", length - offset); + fprintf(stderr, "rest of packet: %i\n", + client->afc_packet->entire_length - client->afc_packet->this_length); } free(buffer); return -1; } - memcpy(buffer+sizeof(AFCPacket), data, offset); + memcpy(buffer + sizeof(AFCPacket), data, offset); iphone_mux_send(client->connection, buffer, client->afc_packet->this_length, &bytes); free(buffer); if (bytes <= 0) { return bytes; - } - + } + if (debug) { fprintf(stderr, "dispatch_AFC_packet: sent the first now go with the second\n"); - fprintf(stderr, "Length: %i\n", length-offset); + fprintf(stderr, "Length: %i\n", length - offset); fprintf(stderr, "Buffer: \n"); - fwrite(data+offset, 1, length-offset, stdout); + fwrite(data + offset, 1, length - offset, stdout); } - - iphone_mux_send(client->connection, data+offset, length-offset, &bytes); + + iphone_mux_send(client->connection, data + offset, length - offset, &bytes); return bytes; } else { - if (debug) fprintf(stderr, "dispatch_AFC_packet doin things the old way\n"); - char *buffer = (char*)malloc(sizeof(char) * client->afc_packet->this_length); - if (debug) fprintf(stderr, "dispatch_AFC_packet packet length = %i\n", client->afc_packet->this_length); - memcpy(buffer, (char*)client->afc_packet, sizeof(AFCPacket)); - if (debug) fprintf(stderr, "dispatch_AFC_packet packet data follows\n"); - if (length > 0) { memcpy(buffer+sizeof(AFCPacket), data, length); buffer[sizeof(AFCPacket)+length] = '\0'; } - if (debug) fwrite(buffer, 1, client->afc_packet->this_length, stdout); - if (debug) fprintf(stderr, "\n"); + if (debug) + fprintf(stderr, "dispatch_AFC_packet doin things the old way\n"); + char *buffer = (char *) malloc(sizeof(char) * client->afc_packet->this_length); + if (debug) + fprintf(stderr, "dispatch_AFC_packet packet length = %i\n", client->afc_packet->this_length); + memcpy(buffer, (char *) client->afc_packet, sizeof(AFCPacket)); + if (debug) + fprintf(stderr, "dispatch_AFC_packet packet data follows\n"); + if (length > 0) { + memcpy(buffer + sizeof(AFCPacket), data, length); + buffer[sizeof(AFCPacket) + length] = '\0'; + } + if (debug) + fwrite(buffer, 1, client->afc_packet->this_length, stdout); + if (debug) + fprintf(stderr, "\n"); iphone_mux_send(client->connection, buffer, client->afc_packet->this_length, &bytes); if (buffer) { @@ -205,13 +224,14 @@ static int dispatch_AFC_packet(iphone_afc_client_t client, const char *data, int * AFC_ERROR operation) */ -static int receive_AFC_data(iphone_afc_client_t client, char **dump_here) { +static int receive_AFC_data(iphone_afc_client_t client, char **dump_here) +{ AFCPacket *r_packet; - char *buffer = (char*)malloc(sizeof(AFCPacket) * 4); + char *buffer = (char *) malloc(sizeof(AFCPacket) * 4); char *final_buffer = NULL; - int bytes = 0, recv_len = 0, current_count=0; + int bytes = 0, recv_len = 0, current_count = 0; int retval = 0; - + iphone_mux_recv(client->connection, buffer, sizeof(AFCPacket) * 4, &bytes); if (bytes <= 0) { free(buffer); @@ -219,102 +239,119 @@ static int receive_AFC_data(iphone_afc_client_t client, char **dump_here) { *dump_here = NULL; return -1; } - - r_packet = (AFCPacket*)malloc(sizeof(AFCPacket)); + + r_packet = (AFCPacket *) malloc(sizeof(AFCPacket)); memcpy(r_packet, buffer, sizeof(AFCPacket)); - - if (r_packet->entire_length == r_packet->this_length && r_packet->entire_length > sizeof(AFCPacket) && r_packet->operation != AFC_ERROR) { - *dump_here = (char*)malloc(sizeof(char) * (r_packet->entire_length-sizeof(AFCPacket))); - memcpy(*dump_here, buffer+sizeof(AFCPacket), r_packet->entire_length-sizeof(AFCPacket)); - retval = r_packet->entire_length - sizeof(AFCPacket); + + if (r_packet->entire_length == r_packet->this_length + && r_packet->entire_length > sizeof(AFCPacket) && r_packet->operation != AFC_ERROR) { + *dump_here = (char *) malloc(sizeof(char) * (r_packet->entire_length - sizeof(AFCPacket))); + memcpy(*dump_here, buffer + sizeof(AFCPacket), r_packet->entire_length - sizeof(AFCPacket)); + retval = r_packet->entire_length - sizeof(AFCPacket); free(buffer); free(r_packet); return retval; } - + uint32 param1 = buffer[sizeof(AFCPacket)]; free(buffer); if (r_packet->operation == AFC_ERROR && !(client->afc_packet->operation == AFC_DELETE && param1 == 7)) { - if (debug) fprintf(stderr, "Oops? Bad operation code received: 0x%X, operation=0x%X, param1=%d\n", - r_packet->operation, client->afc_packet->operation, param1); + if (debug) + fprintf(stderr, + "Oops? Bad operation code received: 0x%X, operation=0x%X, param1=%d\n", + r_packet->operation, client->afc_packet->operation, param1); recv_len = r_packet->entire_length - r_packet->this_length; free(r_packet); - if (debug) fprintf(stderr, "recv_len=%d\n", recv_len); - if(param1 == 0) { - if (debug) fprintf(stderr, "... false alarm, but still\n"); + if (debug) + fprintf(stderr, "recv_len=%d\n", recv_len); + if (param1 == 0) { + if (debug) + fprintf(stderr, "... false alarm, but still\n"); *dump_here = NULL; return 0; + } else { + if (debug) + fprintf(stderr, "Errno %i\n", param1); } - else { if (debug) fprintf(stderr, "Errno %i\n", param1); } *dump_here = NULL; return -1; } else { - if (debug) fprintf(stderr, "Operation code %x\nFull length %i and this length %i\n", r_packet->operation, r_packet->entire_length, r_packet->this_length); + if (debug) + fprintf(stderr, + "Operation code %x\nFull length %i and this length %i\n", + r_packet->operation, r_packet->entire_length, r_packet->this_length); } recv_len = r_packet->entire_length - r_packet->this_length; free(r_packet); - if (!recv_len && r_packet->operation == AFC_SUCCESS_RESPONSE) - { + if (!recv_len && r_packet->operation == AFC_SUCCESS_RESPONSE) { *dump_here = NULL; return 0; } - // Keep collecting packets until we have received the entire file. - buffer = (char*)malloc(sizeof(char) * (recv_len < MAXIMUM_PACKET_SIZE) ? recv_len : MAXIMUM_PACKET_SIZE); - final_buffer = (char*)malloc(sizeof(char) * recv_len); - while(current_count < recv_len){ - iphone_mux_recv(client->connection, buffer, recv_len-current_count, &bytes); - if (debug) fprintf(stderr, "receive_AFC_data: still collecting packets\n"); - if (bytes < 0) - { - if(debug) fprintf(stderr, "receive_AFC_data: mux_recv failed: %d\n", bytes); + buffer = (char *) malloc(sizeof(char) * (recv_len < MAXIMUM_PACKET_SIZE) ? recv_len : MAXIMUM_PACKET_SIZE); + final_buffer = (char *) malloc(sizeof(char) * recv_len); + while (current_count < recv_len) { + iphone_mux_recv(client->connection, buffer, recv_len - current_count, &bytes); + if (debug) + fprintf(stderr, "receive_AFC_data: still collecting packets\n"); + if (bytes < 0) { + if (debug) + fprintf(stderr, "receive_AFC_data: mux_recv failed: %d\n", bytes); break; } - if (bytes > recv_len-current_count) - { - if(debug) fprintf(stderr, "receive_AFC_data: mux_recv delivered too much data\n"); + if (bytes > recv_len - current_count) { + if (debug) + fprintf(stderr, "receive_AFC_data: mux_recv delivered too much data\n"); break; } if (bytes > 7 && strstr(buffer, "CFA6LPAA")) { - if (debug) fprintf(stderr, "receive_AFC_data: WARNING: there is AFC data in this packet at %ti\n", strstr(buffer, "CFA6LPAA") - buffer); - if (debug) fprintf(stderr, "receive_AFC_data: the total packet length is %i\n", bytes); + if (debug) + fprintf(stderr, + "receive_AFC_data: WARNING: there is AFC data in this packet at %ti\n", + strstr(buffer, "CFA6LPAA") - buffer); + if (debug) + fprintf(stderr, "receive_AFC_data: the total packet length is %i\n", bytes); } - - memcpy(final_buffer+current_count, buffer, bytes); + + memcpy(final_buffer + current_count, buffer, bytes); current_count += bytes; } free(buffer); - + *dump_here = final_buffer; return current_count; } -static int count_nullspaces(char *string, int number) { +static int count_nullspaces(char *string, int number) +{ int i = 0, nulls = 0; - + for (i = 0; i < number; i++) { - if (string[i] == '\0') nulls++; + if (string[i] == '\0') + nulls++; } - + return nulls; } -static char **make_strings_list(char *tokens, int true_length) { +static char **make_strings_list(char *tokens, int true_length) +{ int nulls = 0, i = 0, j = 0; char **list = NULL; - - if (!tokens || !true_length) return NULL; - + + if (!tokens || !true_length) + return NULL; + nulls = count_nullspaces(tokens, true_length); - list = (char**)malloc(sizeof(char*) * (nulls + 1)); + list = (char **) malloc(sizeof(char *) * (nulls + 1)); for (i = 0; i < nulls; i++) { - list[i] = strdup(tokens+j); + list[i] = strdup(tokens + j); j += strlen(list[i]) + 1; } list[i] = NULL; - + return list; } @@ -326,15 +363,17 @@ static char **make_strings_list(char *tokens, int true_length) { * @return A char ** list of files in that directory, terminated by an empty * string for now or NULL if there was an error. */ -iphone_error_t iphone_afc_get_dir_list ( iphone_afc_client_t client, const char *dir, char ***list) { +iphone_error_t iphone_afc_get_dir_list(iphone_afc_client_t client, const char *dir, char ***list) +{ int bytes = 0; char *data = NULL, **list_loc = NULL; iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; - - if (!client || !dir || !list || (list && *list)) return IPHONE_E_INVALID_ARG; + + if (!client || !dir || !list || (list && *list)) + return IPHONE_E_INVALID_ARG; afc_lock(client); - + // Send the command client->afc_packet->operation = AFC_LIST_DIR; client->afc_packet->entire_length = 0; @@ -344,22 +383,22 @@ iphone_error_t iphone_afc_get_dir_list ( iphone_afc_client_t client, const char afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; } - // Receive the data bytes = receive_AFC_data(client, &data); if (bytes < 0 && !data) { afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; - } - + } // Parse the data list_loc = make_strings_list(data, bytes); - if (list_loc) ret = IPHONE_E_SUCCESS; - if (data) free(data); + if (list_loc) + ret = IPHONE_E_SUCCESS; + if (data) + free(data); afc_unlock(client); *list = list_loc; - + return ret; } @@ -370,14 +409,16 @@ iphone_error_t iphone_afc_get_dir_list ( iphone_afc_client_t client, const char * @return A char ** list of parameters as given by AFC or NULL if there was an * error. */ -iphone_error_t iphone_afc_get_devinfo ( iphone_afc_client_t client, char ***infos) { +iphone_error_t iphone_afc_get_devinfo(iphone_afc_client_t client, char ***infos) +{ int bytes = 0; char *data = NULL, **list = NULL; - - if (!client || !infos) return IPHONE_E_INVALID_ARG; + + if (!client || !infos) + return IPHONE_E_INVALID_ARG; afc_lock(client); - + // Send the command client->afc_packet->operation = AFC_GET_DEVINFO; client->afc_packet->entire_length = client->afc_packet->this_length = 0; @@ -386,18 +427,17 @@ iphone_error_t iphone_afc_get_devinfo ( iphone_afc_client_t client, char ***info afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; } - // Receive the data bytes = receive_AFC_data(client, &data); if (bytes < 0 && !data) { afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; - } - + } // Parse the data list = make_strings_list(data, bytes); - if (data) free(data); - + if (data) + free(data); + afc_unlock(client); *infos = list; return IPHONE_E_SUCCESS; @@ -411,14 +451,16 @@ iphone_error_t iphone_afc_get_devinfo ( iphone_afc_client_t client, char ***info * @return IPHONE_E_SUCCESS if everythong went well, IPHONE_E_INVALID_ARG * if arguments are NULL or invalid, IPHONE_E_NOT_ENOUGH_DATA otherwise. */ -iphone_error_t iphone_afc_delete_file ( iphone_afc_client_t client, const char *path) { +iphone_error_t iphone_afc_delete_file(iphone_afc_client_t client, const char *path) +{ char *response = NULL; int bytes; - - if (!client || !path || !client->afc_packet || !client->connection) return IPHONE_E_INVALID_ARG; - + + if (!client || !path || !client->afc_packet || !client->connection) + return IPHONE_E_INVALID_ARG; + afc_lock(client); - + // Send command client->afc_packet->this_length = client->afc_packet->entire_length = 0; client->afc_packet->operation = AFC_DELETE; @@ -427,13 +469,13 @@ iphone_error_t iphone_afc_delete_file ( iphone_afc_client_t client, const char * afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; } - // Receive response bytes = receive_AFC_data(client, &response); - if (response) free(response); - + if (response) + free(response); + afc_unlock(client); - + if (bytes < 0) { return IPHONE_E_NOT_ENOUGH_DATA; } else { @@ -450,18 +492,20 @@ iphone_error_t iphone_afc_delete_file ( iphone_afc_client_t client, const char * * @return IPHONE_E_SUCCESS if everythong went well, IPHONE_E_INVALID_ARG * if arguments are NULL or invalid, IPHONE_E_NOT_ENOUGH_DATA otherwise. */ -iphone_error_t iphone_afc_rename_file ( iphone_afc_client_t client, const char *from, const char *to) { +iphone_error_t iphone_afc_rename_file(iphone_afc_client_t client, const char *from, const char *to) +{ char *response = NULL; - char *send = (char*)malloc(sizeof(char) * (strlen(from) + strlen(to) + 1 + sizeof(uint32))); + char *send = (char *) malloc(sizeof(char) * (strlen(from) + strlen(to) + 1 + sizeof(uint32))); int bytes = 0; - - if (!client || !from || !to || !client->afc_packet || !client->connection) return IPHONE_E_INVALID_ARG; - + + if (!client || !from || !to || !client->afc_packet || !client->connection) + return IPHONE_E_INVALID_ARG; + afc_lock(client); - + // Send command - memcpy(send, from, strlen(from)+1); - memcpy(send+strlen(from)+1, to, strlen(to)+1); + memcpy(send, from, strlen(from) + 1); + memcpy(send + strlen(from) + 1, to, strlen(to) + 1); client->afc_packet->entire_length = client->afc_packet->this_length = 0; client->afc_packet->operation = AFC_RENAME; bytes = dispatch_AFC_packet(client, send, strlen(to) + strlen(from) + 2); @@ -470,13 +514,13 @@ iphone_error_t iphone_afc_rename_file ( iphone_afc_client_t client, const char * afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; } - // Receive response bytes = receive_AFC_data(client, &response); - if (response) free(response); + if (response) + free(response); afc_unlock(client); - + if (bytes < 0) { return IPHONE_E_NOT_ENOUGH_DATA; } else { @@ -493,14 +537,16 @@ iphone_error_t iphone_afc_rename_file ( iphone_afc_client_t client, const char * * @return IPHONE_E_SUCCESS if everythong went well, IPHONE_E_INVALID_ARG * if arguments are NULL or invalid, IPHONE_E_NOT_ENOUGH_DATA otherwise. */ -iphone_error_t iphone_afc_mkdir ( iphone_afc_client_t client, const char *dir) { +iphone_error_t iphone_afc_mkdir(iphone_afc_client_t client, const char *dir) +{ int bytes = 0; char *response = NULL; - - if (!client) return IPHONE_E_INVALID_ARG; - + + if (!client) + return IPHONE_E_INVALID_ARG; + afc_lock(client); - + // Send command client->afc_packet->operation = AFC_MAKE_DIR; client->afc_packet->this_length = client->afc_packet->entire_length = 0; @@ -509,13 +555,13 @@ iphone_error_t iphone_afc_mkdir ( iphone_afc_client_t client, const char *dir) { afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; } - // Receive response bytes = receive_AFC_data(client, &response); - if (response) free(response); + if (response) + free(response); afc_unlock(client); - + if (bytes < 0) { return IPHONE_E_NOT_ENOUGH_DATA; } else { @@ -531,18 +577,19 @@ iphone_error_t iphone_afc_mkdir ( iphone_afc_client_t client, const char *dir) { * @return A pointer to an AFCFile struct containing the information received, * or NULL on failure. */ -iphone_afc_file_t afc_get_file_info(iphone_afc_client_t client, const char *path) { +iphone_afc_file_t afc_get_file_info(iphone_afc_client_t client, const char *path) +{ char *received, **list; iphone_afc_file_t my_file; int length, i = 0; - + afc_lock(client); - + // Send command client->afc_packet->operation = AFC_GET_INFO; client->afc_packet->entire_length = client->afc_packet->this_length = 0; dispatch_AFC_packet(client, path, strlen(path)); - + // Receive data length = receive_AFC_data(client, &received); if (received) { @@ -554,23 +601,23 @@ iphone_afc_file_t afc_get_file_info(iphone_afc_client_t client, const char *path } afc_unlock(client); - + // Parse the data if (list) { - my_file = (iphone_afc_file_t)malloc(sizeof(struct iphone_afc_file_int)); + my_file = (iphone_afc_file_t) malloc(sizeof(struct iphone_afc_file_int)); for (i = 0; list[i]; i++) { if (!strcmp(list[i], "st_size")) { - my_file->size = atoi(list[i+1]); + my_file->size = atoi(list[i + 1]); } - + if (!strcmp(list[i], "st_blocks")) { - my_file->blocks = atoi(list[i+1]); + my_file->blocks = atoi(list[i + 1]); } - + if (!strcmp(list[i], "st_ifmt")) { - if (!strcmp(list[i+1], "S_IFREG")) { + if (!strcmp(list[i + 1], "S_IFREG")) { my_file->type = S_IFREG; - } else if (!strcmp(list[i+1], "S_IFDIR")) { + } else if (!strcmp(list[i + 1], "S_IFDIR")) { my_file->type = S_IFDIR; } } @@ -591,24 +638,27 @@ iphone_afc_file_t afc_get_file_info(iphone_afc_client_t client, const char *path * @return A pointer to an AFCFile struct containing the information received, * or NULL on failure. */ -iphone_error_t iphone_afc_get_file_attr ( iphone_afc_client_t client, const char *filename, struct stat *stbuf ) { +iphone_error_t iphone_afc_get_file_attr(iphone_afc_client_t client, const char *filename, struct stat * stbuf) +{ iphone_error_t ret = IPHONE_E_UNKNOWN_ERROR; - if (!client ||!client->connection || !client->afc_packet || !stbuf) return IPHONE_E_INVALID_ARG; + if (!client || !client->connection || !client->afc_packet || !stbuf) + return IPHONE_E_INVALID_ARG; memset(stbuf, 0, sizeof(struct stat)); iphone_afc_file_t file = afc_get_file_info(client, filename); - if (!file){ + if (!file) { ret = IPHONE_E_NO_SUCH_FILE; } else { stbuf->st_mode = file->type | (S_ISDIR(file->type) ? 0755 : 0644); stbuf->st_size = file->size; - stbuf->st_blksize = 2048; // FIXME: Is this the actual block size used on the iPhone? + stbuf->st_blksize = 2048; // FIXME: Is this the actual block + // size used on the iPhone? stbuf->st_blocks = file->blocks; stbuf->st_uid = getuid(); stbuf->st_gid = getgid(); - ret = iphone_afc_close_file(client,file); + ret = iphone_afc_close_file(client, file); } return ret; } @@ -626,32 +676,36 @@ iphone_error_t iphone_afc_get_file_attr ( iphone_afc_client_t client, const char * received by afc_get_file_info) as well as the handle to the file or * NULL in the case of failure. */ -iphone_error_t iphone_afc_open_file ( iphone_afc_client_t client, const char *filename, iphone_afc_file_mode_t file_mode, iphone_afc_file_t *file ) { +iphone_error_t +iphone_afc_open_file(iphone_afc_client_t client, const char *filename, + iphone_afc_file_mode_t file_mode, iphone_afc_file_t * file) +{ iphone_afc_file_t file_loc = NULL; uint32 ag = 0; int bytes = 0, length = 0; - char *data = (char*)malloc(sizeof(char) * (8 + strlen(filename) + 1)); - - if (!client ||!client->connection || !client->afc_packet) return IPHONE_E_INVALID_ARG; - + char *data = (char *) malloc(sizeof(char) * (8 + strlen(filename) + 1)); + + if (!client || !client->connection || !client->afc_packet) + return IPHONE_E_INVALID_ARG; + afc_lock(client); - + // Send command memcpy(data, &file_mode, 4); - memcpy(data+4, &ag, 4); - memcpy(data+8, filename, strlen(filename)); - data[8+strlen(filename)] = '\0'; + memcpy(data + 4, &ag, 4); + memcpy(data + 8, filename, strlen(filename)); + data[8 + strlen(filename)] = '\0'; client->afc_packet->operation = AFC_FILE_OPEN; client->afc_packet->entire_length = client->afc_packet->this_length = 0; - bytes = dispatch_AFC_packet(client, data, 8+strlen(filename)); + bytes = dispatch_AFC_packet(client, data, 8 + strlen(filename)); free(data); - + if (bytes <= 0) { - if (debug) fprintf(stderr, "afc_open_file: Didn't receive a response to the command\n"); + if (debug) + fprintf(stderr, "afc_open_file: Didn't receive a response to the command\n"); afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; } - // Receive the data length = receive_AFC_data(client, &data); if (length > 0 && data) { @@ -664,13 +718,14 @@ iphone_error_t iphone_afc_open_file ( iphone_afc_client_t client, const char *fi *file = file_loc; return IPHONE_E_SUCCESS; } else { - if (debug) fprintf(stderr, "afc_open_file: Didn't get any further data\n"); + if (debug) + fprintf(stderr, "afc_open_file: Didn't get any further data\n"); afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; } afc_unlock(client); - + return IPHONE_E_UNKNOWN_ERROR; } @@ -683,59 +738,70 @@ iphone_error_t iphone_afc_open_file ( iphone_afc_client_t client, const char *fi * * @return The number of bytes read if successful. If there was an error -1. */ -iphone_error_t iphone_afc_read_file ( iphone_afc_client_t client, iphone_afc_file_t file, char *data, int length, uint32_t *bytes) { +iphone_error_t +iphone_afc_read_file(iphone_afc_client_t client, iphone_afc_file_t file, char *data, int length, uint32_t * bytes) +{ char *input = NULL; int current_count = 0, bytes_loc = 0; const int MAXIMUM_READ_SIZE = 1 << 16; - if (!client || !client->afc_packet || !client->connection || !file) return IPHONE_E_INVALID_ARG; - if (debug) fprintf(stderr, "afc_read_file called for length %i\n", length); + if (!client || !client->afc_packet || !client->connection || !file) + return IPHONE_E_INVALID_ARG; + if (debug) + fprintf(stderr, "afc_read_file called for length %i\n", length); afc_lock(client); - // Looping here to get around the maximum amount of data that recieve_AFC_data can handle - while (current_count < length){ - if (debug) fprintf(stderr, "afc_read_file: current count is %i but length is %i\n", current_count, length); - + // Looping here to get around the maximum amount of data that + // recieve_AFC_data can handle + while (current_count < length) { + if (debug) + fprintf(stderr, "afc_read_file: current count is %i but length is %i\n", current_count, length); + // Send the read command - AFCFilePacket *packet = (AFCFilePacket*)malloc(sizeof(AFCFilePacket)); + AFCFilePacket *packet = (AFCFilePacket *) malloc(sizeof(AFCFilePacket)); packet->unknown1 = packet->unknown2 = 0; packet->filehandle = file->filehandle; packet->size = ((length - current_count) < MAXIMUM_READ_SIZE) ? (length - current_count) : MAXIMUM_READ_SIZE; client->afc_packet->operation = AFC_READ; client->afc_packet->entire_length = client->afc_packet->this_length = 0; - bytes_loc = dispatch_AFC_packet(client, (char*)packet, sizeof(AFCFilePacket)); + bytes_loc = dispatch_AFC_packet(client, (char *) packet, sizeof(AFCFilePacket)); free(packet); - + if (bytes_loc <= 0) { afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; } - // Receive the data bytes_loc = receive_AFC_data(client, &input); - if (debug) fprintf(stderr, "afc_read_file: bytes returned: %i\n", bytes_loc); + if (debug) + fprintf(stderr, "afc_read_file: bytes returned: %i\n", bytes_loc); if (bytes_loc < 0) { - if (input) free(input); + if (input) + free(input); afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; } else if (bytes_loc == 0) { - if (input) free(input); + if (input) + free(input); afc_unlock(client); *bytes = current_count; - return IPHONE_E_SUCCESS; //FIXME check that's actually a success + return IPHONE_E_SUCCESS; // FIXME check that's actually a + // success } else { if (input) { - if (debug) fprintf(stderr, "afc_read_file: %d\n", bytes_loc); - memcpy(data+current_count, input, (bytes_loc > length) ? length : bytes_loc); + if (debug) + fprintf(stderr, "afc_read_file: %d\n", bytes_loc); + memcpy(data + current_count, input, (bytes_loc > length) ? length : bytes_loc); free(input); input = NULL; current_count += (bytes_loc > length) ? length : bytes_loc; } } } - if (debug) fprintf(stderr, "afc_read_file: returning current_count as %i\n", current_count); - + if (debug) + fprintf(stderr, "afc_read_file: returning current_count as %i\n", current_count); + afc_unlock(client); *bytes = current_count; return IPHONE_E_SUCCESS; @@ -751,17 +817,22 @@ iphone_error_t iphone_afc_read_file ( iphone_afc_client_t client, iphone_afc_fil * @return The number of bytes written to the file, or a value less than 0 if * none were written... */ -iphone_error_t iphone_afc_write_file ( iphone_afc_client_t client, iphone_afc_file_t file, const char *data, int length, uint32_t *bytes) { +iphone_error_t +iphone_afc_write_file(iphone_afc_client_t client, iphone_afc_file_t file, + const char *data, int length, uint32_t * bytes) +{ char *acknowledgement = NULL; const int MAXIMUM_WRITE_SIZE = 1 << 16; uint32 zero = 0, bytes_loc = 0, segments = (length / MAXIMUM_WRITE_SIZE), current_count = 0, i = 0; char *out_buffer = NULL; - if (!client ||!client->afc_packet || !client->connection || !file || !bytes) return IPHONE_E_INVALID_ARG; - + if (!client || !client->afc_packet || !client->connection || !file || !bytes) + return IPHONE_E_INVALID_ARG; + afc_lock(client); - if (debug) fprintf(stderr, "afc_write_file: Write length: %i\n", length); + if (debug) + fprintf(stderr, "afc_write_file: Write length: %i\n", length); // Divide the file into segments. for (i = 0; i < segments; i++) { @@ -769,10 +840,10 @@ iphone_error_t iphone_afc_write_file ( iphone_afc_client_t client, iphone_afc_fi client->afc_packet->this_length = sizeof(AFCPacket) + 8; client->afc_packet->entire_length = client->afc_packet->this_length + MAXIMUM_WRITE_SIZE; client->afc_packet->operation = AFC_WRITE; - out_buffer = (char*)malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket)); - memcpy(out_buffer, (char*)&file->filehandle, sizeof(uint32)); - memcpy(out_buffer+4, (char*)&zero, sizeof(uint32)); - memcpy(out_buffer+8, data+current_count, MAXIMUM_WRITE_SIZE); + out_buffer = (char *) malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket)); + memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32)); + memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32)); + memcpy(out_buffer + 8, data + current_count, MAXIMUM_WRITE_SIZE); bytes_loc = dispatch_AFC_packet(client, out_buffer, MAXIMUM_WRITE_SIZE + 8); if (bytes_loc < 0) { afc_unlock(client); @@ -788,39 +859,42 @@ iphone_error_t iphone_afc_write_file ( iphone_afc_client_t client, iphone_afc_fi return IPHONE_E_NOT_ENOUGH_DATA; } } - - // By this point, we should be at the end. i.e. the last segment that didn't get sent in the for loop - // this length is fine because it's always sizeof(AFCPacket) + 8, but to be sure we do it again + + // By this point, we should be at the end. i.e. the last segment that + // didn't get sent in the for loop + // this length is fine because it's always sizeof(AFCPacket) + 8, but + // to be sure we do it again if (current_count == length) { afc_unlock(client); *bytes = current_count; return IPHONE_E_SUCCESS; } - + client->afc_packet->this_length = sizeof(AFCPacket) + 8; client->afc_packet->entire_length = client->afc_packet->this_length + (length - current_count); client->afc_packet->operation = AFC_WRITE; - out_buffer = (char*)malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket)); - memcpy(out_buffer, (char*)&file->filehandle, sizeof(uint32)); - memcpy(out_buffer+4, (char*)&zero, sizeof(uint32)); - memcpy(out_buffer+8, data+current_count, (length - current_count)); + out_buffer = (char *) malloc(sizeof(char) * client->afc_packet->entire_length - sizeof(AFCPacket)); + memcpy(out_buffer, (char *) &file->filehandle, sizeof(uint32)); + memcpy(out_buffer + 4, (char *) &zero, sizeof(uint32)); + memcpy(out_buffer + 8, data + current_count, (length - current_count)); bytes_loc = dispatch_AFC_packet(client, out_buffer, (length - current_count) + 8); free(out_buffer); out_buffer = NULL; - + current_count += bytes_loc; - + if (bytes_loc <= 0) { afc_unlock(client); *bytes = current_count; return IPHONE_E_SUCCESS; } - + zero = bytes_loc; bytes_loc = receive_AFC_data(client, &acknowledgement); afc_unlock(client); if (bytes_loc < 0) { - if (debug) fprintf(stderr, "afc_write_file: uh oh?\n"); + if (debug) + fprintf(stderr, "afc_write_file: uh oh?\n"); } *bytes = current_count; return IPHONE_E_SUCCESS; @@ -832,19 +906,22 @@ iphone_error_t iphone_afc_write_file ( iphone_afc_client_t client, iphone_afc_fi * @param file A pointer to an AFCFile struct containing the file handle of the * file to close. */ -iphone_error_t iphone_afc_close_file ( iphone_afc_client_t client, iphone_afc_file_t file) { - if (!client || !file) return IPHONE_E_INVALID_ARG; +iphone_error_t iphone_afc_close_file(iphone_afc_client_t client, iphone_afc_file_t file) +{ + if (!client || !file) + return IPHONE_E_INVALID_ARG; char *buffer = malloc(sizeof(char) * 8); uint32 zero = 0; int bytes = 0; - + afc_lock(client); - - if (debug) fprintf(stderr, "afc_close_file: File handle %i\n", file->filehandle); - + + if (debug) + fprintf(stderr, "afc_close_file: File handle %i\n", file->filehandle); + // Send command memcpy(buffer, &file->filehandle, sizeof(uint32)); - memcpy(buffer+sizeof(uint32), &zero, sizeof(zero)); + memcpy(buffer + sizeof(uint32), &zero, sizeof(zero)); client->afc_packet->operation = AFC_FILE_CLOSE; client->afc_packet->entire_length = client->afc_packet->this_length = 0; bytes = dispatch_AFC_packet(client, buffer, sizeof(char) * 8); @@ -852,16 +929,17 @@ iphone_error_t iphone_afc_close_file ( iphone_afc_client_t client, iphone_afc_fi buffer = NULL; // FIXME: Is this necesary? - //client->afc_packet->entire_length = client->afc_packet->this_length = 0; - - if (bytes <= 0) { - afc_unlock(client); + // client->afc_packet->entire_length = client->afc_packet->this_length + // = 0; + + if (bytes <= 0) { + afc_unlock(client); return IPHONE_E_UNKNOWN_ERROR; } - // Receive the response bytes = receive_AFC_data(client, &buffer); - if (buffer) free(buffer); + if (buffer) + free(buffer); free(file); afc_unlock(client); return IPHONE_E_SUCCESS; @@ -876,39 +954,41 @@ iphone_error_t iphone_afc_close_file ( iphone_afc_client_t client, iphone_afc_fi * * @return IPHONE_E_SUCCESS on success, IPHONE_E_NOT_ENOUGH_DATA on failure. */ -iphone_error_t iphone_afc_seek_file ( iphone_afc_client_t client, iphone_afc_file_t file, int seekpos) { - char *buffer = (char*)malloc(sizeof(char) * 24); +iphone_error_t iphone_afc_seek_file(iphone_afc_client_t client, iphone_afc_file_t file, int seekpos) +{ + char *buffer = (char *) malloc(sizeof(char) * 24); uint32 seekto = 0, bytes = 0, zero = 0; - - if (seekpos < 0) seekpos = file->size - abs(seekpos); + + if (seekpos < 0) + seekpos = file->size - abs(seekpos); afc_lock(client); - + // Send the command seekto = seekpos; - memcpy(buffer, &file->filehandle, sizeof(uint32)); // handle - memcpy(buffer+4, &zero, sizeof(uint32)); // pad - memcpy(buffer+8, &zero, sizeof(uint32)); // fromwhere - memcpy(buffer+12, &zero, sizeof(uint32)); // pad - memcpy(buffer+16, &seekto, sizeof(uint32)); // offset - memcpy(buffer+20, &zero, sizeof(uint32)); // pad + memcpy(buffer, &file->filehandle, sizeof(uint32)); // handle + memcpy(buffer + 4, &zero, sizeof(uint32)); // pad + memcpy(buffer + 8, &zero, sizeof(uint32)); // fromwhere + memcpy(buffer + 12, &zero, sizeof(uint32)); // pad + memcpy(buffer + 16, &seekto, sizeof(uint32)); // offset + memcpy(buffer + 20, &zero, sizeof(uint32)); // pad client->afc_packet->operation = AFC_FILE_SEEK; client->afc_packet->this_length = client->afc_packet->entire_length = 0; bytes = dispatch_AFC_packet(client, buffer, 23); free(buffer); buffer = NULL; - - if (bytes <= 0) { + + if (bytes <= 0) { afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; - } - + } // Receive response bytes = receive_AFC_data(client, &buffer); - if (buffer) free(buffer); - + if (buffer) + free(buffer); + afc_unlock(client); - + if (bytes >= 0) { return IPHONE_E_SUCCESS; } else { @@ -927,17 +1007,18 @@ iphone_error_t iphone_afc_seek_file ( iphone_afc_client_t client, iphone_afc_fil * @note This function is more akin to ftruncate than truncate, and truncate * calls would have to open the file before calling this, sadly. */ -iphone_error_t iphone_afc_truncate_file ( iphone_afc_client_t client, iphone_afc_file_t file, uint32_t newsize) { - char *buffer = (char*)malloc(sizeof(char) * 16); +iphone_error_t iphone_afc_truncate_file(iphone_afc_client_t client, iphone_afc_file_t file, uint32_t newsize) +{ + char *buffer = (char *) malloc(sizeof(char) * 16); uint32 bytes = 0, zero = 0; - + afc_lock(client); - + // Send command - memcpy(buffer, &file->filehandle, sizeof(uint32)); // handle - memcpy(buffer+4, &zero, sizeof(uint32)); // pad - memcpy(buffer+8, &newsize, sizeof(uint32)); // newsize - memcpy(buffer+12, &zero, 3); // pad + memcpy(buffer, &file->filehandle, sizeof(uint32)); // handle + memcpy(buffer + 4, &zero, sizeof(uint32)); // pad + memcpy(buffer + 8, &newsize, sizeof(uint32)); // newsize + memcpy(buffer + 12, &zero, 3); // pad client->afc_packet->operation = AFC_FILE_TRUNCATE; client->afc_packet->this_length = client->afc_packet->entire_length = 0; bytes = dispatch_AFC_packet(client, buffer, 15); @@ -948,13 +1029,13 @@ iphone_error_t iphone_afc_truncate_file ( iphone_afc_client_t client, iphone_afc afc_unlock(client); return IPHONE_E_NOT_ENOUGH_DATA; } - // Receive response bytes = receive_AFC_data(client, &buffer); - if (buffer) free(buffer); - + if (buffer) + free(buffer); + afc_unlock(client); - + if (bytes >= 0) { return IPHONE_E_SUCCESS; } else { -- cgit v1.1-32-gdbae