summaryrefslogtreecommitdiffstats
path: root/tools/idevicebackup.c
diff options
context:
space:
mode:
Diffstat (limited to 'tools/idevicebackup.c')
-rw-r--r--tools/idevicebackup.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/tools/idevicebackup.c b/tools/idevicebackup.c
index 26771f8..7935477 100644
--- a/tools/idevicebackup.c
+++ b/tools/idevicebackup.c
@@ -288,8 +288,8 @@ static plist_t mobilebackup_factory_info_plist_new()
288 /* gather data from lockdown */ 288 /* gather data from lockdown */
289 plist_t value_node = NULL; 289 plist_t value_node = NULL;
290 plist_t root_node = NULL; 290 plist_t root_node = NULL;
291 char *uuid = NULL; 291 char *udid = NULL;
292 char *uuid_uppercase = NULL; 292 char *udid_uppercase = NULL;
293 293
294 plist_t ret = plist_new_dict(); 294 plist_t ret = plist_new_dict();
295 295
@@ -323,14 +323,14 @@ static plist_t mobilebackup_factory_info_plist_new()
323 plist_dict_insert_item(ret, "Serial Number", plist_copy(value_node)); 323 plist_dict_insert_item(ret, "Serial Number", plist_copy(value_node));
324 324
325 value_node = plist_dict_get_item(root_node, "UniqueDeviceID"); 325 value_node = plist_dict_get_item(root_node, "UniqueDeviceID");
326 idevice_get_uuid(phone, &uuid); 326 idevice_get_udid(phone, &udid);
327 plist_dict_insert_item(ret, "Target Identifier", plist_new_string(uuid)); 327 plist_dict_insert_item(ret, "Target Identifier", plist_new_string(udid));
328 328
329 /* uppercase */ 329 /* uppercase */
330 uuid_uppercase = str_toupper(uuid); 330 udid_uppercase = str_toupper(udid);
331 plist_dict_insert_item(ret, "Unique Identifier", plist_new_string(uuid_uppercase)); 331 plist_dict_insert_item(ret, "Unique Identifier", plist_new_string(udid_uppercase));
332 free(uuid_uppercase); 332 free(udid_uppercase);
333 free(uuid); 333 free(udid);
334 334
335 /* FIXME: Embed files as <data> nodes */ 335 /* FIXME: Embed files as <data> nodes */
336 plist_t files = plist_new_dict(); 336 plist_t files = plist_new_dict();
@@ -521,7 +521,7 @@ static int mobilebackup_info_is_current_device(plist_t info)
521 /* get basic device information in one go */ 521 /* get basic device information in one go */
522 lockdownd_get_value(client, NULL, NULL, &root_node); 522 lockdownd_get_value(client, NULL, NULL, &root_node);
523 523
524 /* verify UUID */ 524 /* verify UDID */
525 value_node = plist_dict_get_item(root_node, "UniqueDeviceID"); 525 value_node = plist_dict_get_item(root_node, "UniqueDeviceID");
526 node = plist_dict_get_item(info, "Target Identifier"); 526 node = plist_dict_get_item(info, "Target Identifier");
527 527
@@ -810,7 +810,7 @@ static void print_usage(int argc, char **argv)
810 printf(" restore\tRestores a device backup from DIRECTORY.\n\n"); 810 printf(" restore\tRestores a device backup from DIRECTORY.\n\n");
811 printf("options:\n"); 811 printf("options:\n");
812 printf(" -d, --debug\t\tenable communication debugging\n"); 812 printf(" -d, --debug\t\tenable communication debugging\n");
813 printf(" -u, --uuid UUID\ttarget specific device by its 40-digit device UUID\n"); 813 printf(" -u, --udid UDID\ttarget specific device by its 40-digit device UDID\n");
814 printf(" -h, --help\t\tprints usage information\n"); 814 printf(" -h, --help\t\tprints usage information\n");
815 printf("\n"); 815 printf("\n");
816} 816}
@@ -819,9 +819,9 @@ int main(int argc, char *argv[])
819{ 819{
820 idevice_error_t ret = IDEVICE_E_UNKNOWN_ERROR; 820 idevice_error_t ret = IDEVICE_E_UNKNOWN_ERROR;
821 int i; 821 int i;
822 char uuid[41]; 822 char udid[41];
823 uint16_t port = 0; 823 uint16_t port = 0;
824 uuid[0] = 0; 824 udid[0] = 0;
825 int cmd = -1; 825 int cmd = -1;
826 int is_full_backup = 0; 826 int is_full_backup = 0;
827 char *backup_directory = NULL; 827 char *backup_directory = NULL;
@@ -851,13 +851,13 @@ int main(int argc, char *argv[])
851 idevice_set_debug_level(1); 851 idevice_set_debug_level(1);
852 continue; 852 continue;
853 } 853 }
854 else if (!strcmp(argv[i], "-u") || !strcmp(argv[i], "--uuid")) { 854 else if (!strcmp(argv[i], "-u") || !strcmp(argv[i], "--udid")) {
855 i++; 855 i++;
856 if (!argv[i] || (strlen(argv[i]) != 40)) { 856 if (!argv[i] || (strlen(argv[i]) != 40)) {
857 print_usage(argc, argv); 857 print_usage(argc, argv);
858 return 0; 858 return 0;
859 } 859 }
860 strcpy(uuid, argv[i]); 860 strcpy(udid, argv[i]);
861 continue; 861 continue;
862 } 862 }
863 else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) { 863 else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
@@ -910,10 +910,10 @@ int main(int argc, char *argv[])
910 910
911 printf("Backup directory is \"%s\"\n", backup_directory); 911 printf("Backup directory is \"%s\"\n", backup_directory);
912 912
913 if (uuid[0] != 0) { 913 if (udid[0] != 0) {
914 ret = idevice_new(&phone, uuid); 914 ret = idevice_new(&phone, udid);
915 if (ret != IDEVICE_E_SUCCESS) { 915 if (ret != IDEVICE_E_SUCCESS) {
916 printf("No device found with uuid %s, is it plugged in?\n", uuid); 916 printf("No device found with udid %s, is it plugged in?\n", udid);
917 return -1; 917 return -1;
918 } 918 }
919 } 919 }