From 3913f910a840068ec34fd62f60b3bb78f7a9edd3 Mon Sep 17 00:00:00 2001 From: Nikias Bassen Date: Thu, 2 Feb 2012 02:07:50 +0100 Subject: main: store product version & build in client struct for later checks --- src/idevicerestore.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'src/idevicerestore.c') diff --git a/src/idevicerestore.c b/src/idevicerestore.c index b4127a2..13966d0 100644 --- a/src/idevicerestore.c +++ b/src/idevicerestore.c @@ -163,7 +163,10 @@ int main(int argc, char* argv[]) { } /* print iOS information from the manifest */ - build_manifest_print_information(buildmanifest); + build_manifest_get_version_information(buildmanifest, &client->version, &client->build); + + info("Product Version: %s\n", client->version); + info("Product Build: %s\n", client->build); if (client->flags & FLAG_CUSTOM) { /* prevent signing custom firmware */ @@ -662,31 +665,24 @@ int ipsw_get_component_by_path(const char* ipsw, plist_t tss, const char* path, return 0; } -void build_manifest_print_information(plist_t build_manifest) { - char* value = NULL; +void build_manifest_get_version_information(plist_t build_manifest, char** product_version, char** product_build) { plist_t node = NULL; + *product_version = NULL; + *product_build = NULL; node = plist_dict_get_item(build_manifest, "ProductVersion"); if (!node || plist_get_node_type(node) != PLIST_STRING) { error("ERROR: Unable to find ProductVersion node\n"); return; } - plist_get_string_val(node, &value); - - info("Product Version: %s\n", value); - free(value); + plist_get_string_val(node, product_version); node = plist_dict_get_item(build_manifest, "ProductBuildVersion"); if (!node || plist_get_node_type(node) != PLIST_STRING) { error("ERROR: Unable to find ProductBuildVersion node\n"); return; } - plist_get_string_val(node, &value); - - info("Product Build: %s\n", value); - free(value); - - node = NULL; + plist_get_string_val(node, product_build); } void build_identity_print_information(plist_t build_identity) { -- cgit v1.1-32-gdbae