rename dedupe_gc to nandroid_dedupe_gc

Change-Id: Ibd144703050ca33378b0af2eec63d8c8440c7a23

nandroid.c

@@ -135,7 +135,7 @@ static int tar_compress_wrapper(const char* backup_path, const char* backup_file
     return __pclose(fp);
 }
 
-void dedupe_gc(const char* blob_dir) {
+void nandroid_dedupe_gc(const char* blob_dir) {
     char backup_dir[PATH_MAX];
     strcpy(backup_dir, blob_dir);
     char *d = dirname(backup_dir);
@@ -163,7 +163,7 @@ static int dedupe_compress_wrapper(const char* backup_path, const char* backup_f
 
     if (!(nandroid_backup_bitfield & NANDROID_FIELD_DEDUPE_CLEARED_SPACE)) {
         nandroid_backup_bitfield |= NANDROID_FIELD_DEDUPE_CLEARED_SPACE;
-        dedupe_gc(blob_dir);
+        nandroid_dedupe_gc(blob_dir);
     }
 
     sprintf(tmp, "dedupe c %s %s %s.dup %s", backup_path, blob_dir, backup_file_image, strcmp(backup_path, "/data") == 0 && is_data_media() ? "./media" : "");
@@ -184,14 +184,23 @@ static int dedupe_compress_wrapper(const char* backup_path, const char* backup_f
 }
 
 static nandroid_backup_handler default_backup_handler = dedupe_compress_wrapper;
+static char forced_backup_format[5] = "";
+void nandroid_force_backup_format(const char* fmt) {
+    strcpy(forced_backup_format, fmt);
+}
 static void refresh_default_backup_handler() {
     char fmt[5];
-    ensure_path_mounted("/sdcard");
-    FILE* f = fopen("/sdcard/clockworkmod/.default_backup_format", "r");
-    if (NULL == f)
-        return;
-    fread(fmt, 1, sizeof(fmt), f);
-    fclose(f);
+    if (strlen(forced_backup_format) > 0) {
+        strcpy(fmt, forced_backup_format);
+    }
+    else {
+        ensure_path_mounted("/sdcard");
+        FILE* f = fopen("/sdcard/clockworkmod/.default_backup_format", "r");
+        if (NULL == f)
+            return;
+        fread(fmt, 1, sizeof(fmt), f);
+        fclose(f);
+    }
     fmt[3] = NULL;
     if (0 == strcmp(fmt, "tar"))
         default_backup_handler = tar_compress_wrapper;
@@ -215,6 +224,9 @@ static nandroid_backup_handler get_backup_handler(const char *backup_path) {
         return default_backup_handler;
     }
 
+    if (strlen(forced_backup_format) > 0)
+        return default_backup_handler;
+
     // cwr5, we prefer dedupe for everything except yaffs2
     if (strcmp("yaffs2", mv->filesystem) == 0) {
         return mkyaffs2image_wrapper;

nandroid.h

@@ -4,6 +4,7 @@
 int nandroid_main(int argc, char** argv);
 int nandroid_backup(const char* backup_path);
 int nandroid_restore(const char* backup_path, int restore_boot, int restore_system, int restore_data, int restore_cache, int restore_sdext, int restore_wimax);
-void dedupe_gc(const char* blob_dir);
+void nandroid_dedupe_gc(const char* blob_dir);
+void nandroid_force_backup_format(const char* fmt);
 
 #endif