From 65a4c73b1eea5f29f517d8357248c537dc6752ec Mon Sep 17 00:00:00 2001
From: bigbiff bigbiff <bigbiff@teamw.in>
Date: Fri, 15 Mar 2013 15:17:50 -0400
Subject: trying to fix md5 Change-Id:
 I4ec037f76aa965bc818afe924942adbe9a080b36

---
 partition.cpp | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'partition.cpp')

diff --git a/partition.cpp b/partition.cpp
index 346c298b2..681604f21 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -941,30 +941,46 @@ bool TWPartition::Backup(string backup_folder) {
 }
 
 bool TWPartition::Check_MD5(string restore_folder) {
-	string Full_Filename;
+	string Full_Filename, md5file;
 	char split_filename[512];
 	int index = 0;
 	twrpDigest md5sum;
 
+	memset(split_filename, 0, sizeof(split_filename));
 	Full_Filename = restore_folder + "/" + Backup_FileName;
 	if (!TWFunc::Path_Exists(Full_Filename)) {
 		// This is a split archive, we presume
 		sprintf(split_filename, "%s%03i", Full_Filename.c_str(), index);
+		LOGI("split_filename: %s\n", split_filename);
+		md5file = split_filename;
+		md5file += ".md5";
+		if (!TWFunc::Path_Exists(md5file)) {
+			LOGE("No md5 file found for '%s'.\n", split_filename);
+			LOGE("Please unselect Enable MD5 verification to restore.\n");
+			return false;
+		}
+		md5sum.setfn(split_filename);
 		while (index < 1000 && TWFunc::Path_Exists(split_filename)) {
-			md5sum.setfn(split_filename);
 			if (md5sum.verify_md5digest() != 0) {
 				LOGE("MD5 failed to match on '%s'.\n", split_filename);
 				return false;
 			}
 			index++;
 			sprintf(split_filename, "%s%03i", Full_Filename.c_str(), index);
+			md5sum.setfn(split_filename);
 		}
 		return true;
 	} else {
 		// Single file archive
+		md5file = Full_Filename + ".md5";
+		if (!TWFunc::Path_Exists(md5file)) {
+			LOGE("No md5 file found for '%s'.\n", Full_Filename.c_str());
+			LOGE("Please unselect Enable MD5 verification to restore.\n");
+			return false;
+		}
 		md5sum.setfn(Full_Filename);
 		if (md5sum.verify_md5digest() != 0) {
-			LOGE("MD5 failed to match on '%s'.\n", split_filename);
+			LOGE("MD5 failed to match on '%s'.\n", Full_Filename.c_str());
 			return false;
 		} else
 			return true;
-- 
cgit v1.2.3