diff options
Diffstat (limited to 'tools/idevicebackup2.c')
| -rw-r--r-- | tools/idevicebackup2.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/idevicebackup2.c b/tools/idevicebackup2.c index be7a132..c73b269 100644 --- a/tools/idevicebackup2.c +++ b/tools/idevicebackup2.c @@ -47,6 +47,7 @@ #include <libimobiledevice/sbservices.h> #include <libimobiledevice/diagnostics_relay.h> #include <libimobiledevice-glue/utils.h> +#include <plist/plist.h> #include <endianness.h> @@ -606,7 +607,7 @@ static int mb2_status_check_snapshot_state(const char *path, const char *udid, c plist_t status_plist = NULL; char *file_path = string_build_path(path, udid, "Status.plist", NULL); - plist_read_from_filename(&status_plist, file_path); + plist_read_from_file(file_path, &status_plist, NULL); free(file_path); if (!status_plist) { printf("Could not read Status.plist!\n"); @@ -1521,7 +1522,7 @@ int main(int argc, char *argv[]) { "settings", no_argument, NULL, OPT_SETTINGS }, { "remove", no_argument, NULL, OPT_REMOVE }, { "skip-apps", no_argument, NULL, OPT_SKIP_APPS }, - { "password", no_argument, NULL, OPT_PASSWORD }, + { "password", required_argument, NULL, OPT_PASSWORD }, { "full", no_argument, NULL, OPT_FULL }, { NULL, 0, NULL, 0} }; @@ -1555,6 +1556,7 @@ int main(int argc, char *argv[]) return 2; } source_udid = strdup(optarg); + break; case 'i': interactive_mode = 1; break; @@ -1779,7 +1781,7 @@ int main(int argc, char *argv[]) free(info_path); } plist_t manifest_plist = NULL; - plist_read_from_filename(&manifest_plist, manifest_path); + plist_read_from_file(manifest_path, &manifest_plist, NULL); if (!manifest_plist) { idevice_free(device); free(info_path); @@ -1935,7 +1937,7 @@ int main(int argc, char *argv[]) /* verify existing Info.plist */ if (info_path && (stat(info_path, &st) == 0) && cmd != CMD_CLOUD) { PRINT_VERBOSE(1, "Reading Info.plist from backup.\n"); - plist_read_from_filename(&info_plist, info_path); + plist_read_from_file(info_path, &info_plist, NULL); if (!info_plist) { printf("Could not read Info.plist\n"); @@ -2029,7 +2031,7 @@ checkpoint: cmd = CMD_LEAVE; } remove_file(info_path); - plist_write_to_filename(info_plist, info_path, PLIST_FORMAT_XML); + plist_write_to_file(info_plist, info_path, PLIST_FORMAT_XML, 0); free(info_path); plist_free(info_plist); |