Add codes for backup directory at recovery

- Directories which have .bck postfix will be removed
  when recovery requests

Change-Id: I6c4571fe5fe5fa45906a5e7aa9f6bd8a9d7ee781
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/common/step/filesystem/step_remove_temporary_directory.cc b/src/common/step/filesystem/step_remove_temporary_directory.cc
index 0de81c8..acf759b 100644 (file)
--- a/src/common/step/filesystem/step_remove_temporary_directory.cc
+++ b/src/common/step/filesystem/step_remove_temporary_directory.cc
@@ -25,13 +25,17 @@ Step::Status StepRemoveTemporaryDirectory::RecoveryNew() {
 Step::Status StepRemoveTemporaryDirectory::RemoveFiles() {
   bf::path unpack_dir_path = context_->unpacked_dir_path.get();
   bf::path patch_dir_path = unpack_dir_path;
+  bf::path mount_dir_path = unpack_dir_path;
   patch_dir_path += ".patch";
+  mount_dir_path += ".bck";
   if (unpack_dir_path.empty())
     return Step::Status::OK;
   if (!RemoveAll(unpack_dir_path))
     return Step::Status::RECOVERY_ERROR;
   if (!RemoveAll(patch_dir_path))
     return Step::Status::RECOVERY_ERROR;
+  if (!RemoveAll(mount_dir_path))
+    return Step::Status::RECOVERY_ERROR;
   return Step::Status::OK;
 }
 

diff --git a/src/common/utils/file_util.cc b/src/common/utils/file_util.cc
index 7741ae8..f9a70b7 100644 (file)
--- a/src/common/utils/file_util.cc
+++ b/src/common/utils/file_util.cc
@@ -523,7 +523,7 @@ bool ExtractToTmpDir(const char* zip_path, const bf::path& tmp_dir,
       }
 
       if (!is_directory(filename_in_zip_path)) {
-        FILE *out = fopen(raw_file_name_in_zip, "wbx");
+        FILE* out = fopen(raw_file_name_in_zip, "wbx");
         if (!out) {
           LOG(ERROR) << "Failed to open destination ";
           return false;