mirrors/futurerestore
1
0
Fork 0
mirror of https://github.com/tihmstar/futurerestore.git synced 2025-01-02 19:25:31 +00:00
Code Issues Projects Releases Wiki Activity

fixed bug where -w would try to restore

Browse source
This commit is contained in:
tihmstar 2016-10-02 22:06:30 +02:00
parent 79dcb8dabc
commit 852de310fa
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
futurerestore/futurerestore.cpp
View file

@ -170,6 +170,7 @@ void futurerestore::waitForNonce(){
void futurerestore::loadAPTicket(const char *apticketPath){ void futurerestore::loadAPTicket(const char *apticketPath){
if (_apticket) plist_free(_apticket), _apticket = NULL; if (_apticket) plist_free(_apticket), _apticket = NULL;
FILE *f = fopen(apticketPath,"rb"); FILE *f = fopen(apticketPath,"rb");
if (!f) reterror(-9, "failed to load apticket at %s\n",apticketPath);
fseek(f, 0, SEEK_END); fseek(f, 0, SEEK_END);
size_t fSize = ftell(f); size_t fSize = ftell(f);
@ -265,24 +266,28 @@ int futurerestore::doRestore(const char *ipsw, bool noerase){
sepbuildmanifest = loadPlistFromFile(_sepManifestPath); sepbuildmanifest = loadPlistFromFile(_sepManifestPath);
sep_build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(sepbuildmanifest, client->device->hardware_model, "Erase"); sep_build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(sepbuildmanifest, client->device->hardware_model, "Erase");
if (!sep_build_identity) sep_build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(sepbuildmanifest, client->device->hardware_model, "Update");
if (sep_build_identity == NULL) { if (sep_build_identity == NULL) {
reterror(-5,"ERROR: Unable to find any build identities for sep\n"); reterror(-5,"ERROR: Unable to find any build identities for sep\n");
} }
basebandbuildmanifest = loadPlistFromFile(_basebandManifestPath); basebandbuildmanifest = loadPlistFromFile(_basebandManifestPath);
bb_build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(basebandbuildmanifest, client->device->hardware_model, "Erase"); bb_build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(basebandbuildmanifest, client->device->hardware_model, "Erase");
if (!bb_build_identity) bb_build_identity = build_manifest_get_build_identity_for_model_with_restore_behavior(basebandbuildmanifest, client->device->hardware_model, "Update");
if (bb_build_identity == NULL) { if (bb_build_identity == NULL) {
reterror(-5,"ERROR: Unable to find any build identities for baseband\n"); reterror(-5,"ERROR: Unable to find any build identities for baseband\n");
} }
plist_t bb_manifest = plist_dict_get_item(bb_build_identity, "Manifest"); plist_t bb_manifest = plist_dict_get_item(bb_build_identity, "Manifest");
plist_t bb_baseband = plist_copy(plist_dict_get_item(bb_manifest, "BasebandFirmware")); plist_t bb_baseband = plist_copy(plist_dict_get_item(bb_manifest, "BasebandFirmware"));
plist_t manifest = plist_dict_get_item(build_identity, "Manifest"); plist_t sep_manifest = plist_dict_get_item(sep_build_identity, "Manifest");
plist_t sep_sep = plist_copy(plist_dict_get_item(sep_manifest, "SEP"));
plist_t manifest = plist_dict_get_item(build_identity, "Manifest");
plist_dict_set_item(manifest, "BasebandFirmware", bb_baseband); plist_dict_set_item(manifest, "BasebandFirmware", bb_baseband);
plist_dict_set_item(manifest, "SEP", sep_sep);
client->bbfwtmp = (char*)_basebandPath; client->bbfwtmp = (char*)_basebandPath;

4
futurerestore/main.cpp
View file

@ -129,9 +129,9 @@ int main(int argc, const char * argv[]) {
if (apticketPath) client.loadAPTicket(apticketPath); if (apticketPath) client.loadAPTicket(apticketPath);
if (!(apticketPath && ipsw) if (!((apticketPath && ipsw)
&& ((basebandPath && basebandManifestPath) || (flags & FLAG_LATEST_BASEBAND)) && ((basebandPath && basebandManifestPath) || (flags & FLAG_LATEST_BASEBAND))
&& ((sepPath && sepManifestPath) || (flags & FLAG_LATEST_SEP)) ) { && ((sepPath && sepManifestPath) || (flags & FLAG_LATEST_SEP)))) {
if (!(flags & FLAG_WAIT) || ipsw){ if (!(flags & FLAG_WAIT) || ipsw){
error("missing argument\n"); error("missing argument\n");
cmd_help(); cmd_help();