Changeset 2338 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

Timestamp:

Aug 21, 2009, 1:47:12 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Adds LZMA support (Fix #309)
• Change

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-rstr-compare.c (modified) (2 diffs)
• mondo-rstr-tools.c (modified) (3 diffs)
• mondorestore.c (modified) (4 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -253 +253 @@
     if (strstr(tarball_fname, ".bz2")) {
         mr_asprintf(compressor_exe, "bzip2");
+    } else if (strstr(tarball_fname, ".lzma")) {
+        mr_asprintf(compressor_exe, "lzma");
     } else if (strstr(tarball_fname, ".gz")) {
         mr_asprintf(compressor_exe, "gzip");
@@ -384 +386 @@
             mr_free(tarball_fname);
             mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzo", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%d.afio.lzma", current_tarball_number);
         }
         if (!does_file_exist(tarball_fname)) {

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -897 +897 @@
 mr_free(value);
 
+value = read_cfg_var(cfg_file, "use-lzma");
+if (value && strstr(value, "yes")) {
+    bkpinfo->use_lzma = TRUE;
+    bkpinfo->use_lzo = FALSE;
+    bkpinfo->use_gzip = FALSE;
+    mr_free(bkpinfo->zip_exe);
+    mr_asprintf(bkpinfo->zip_exe, "lzma");
+    mr_free(bkpinfo->zip_suffix);
+    mr_asprintf(bkpinfo->zip_suffix, "lzma");
+}
+mr_free(value);
+
 value = read_cfg_var(cfg_file, "use-lzo");
 if (value && strstr(value, "yes")) {
+    bkpinfo->use_lzma = FALSE;
     bkpinfo->use_lzo = TRUE;
     bkpinfo->use_gzip = FALSE;
@@ -910 +923 @@
 value = read_cfg_var(cfg_file, "use-gzip");
 if (value && strstr(value, "yes")) {
+    bkpinfo->use_lzma = FALSE;
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = TRUE;
@@ -921 +935 @@
 value = read_cfg_var(cfg_file, "use-comp");
 if (value && strstr(value, "yes")) {
+    bkpinfo->use_lzma = FALSE;
     bkpinfo->use_lzo = FALSE;
     bkpinfo->use_gzip = FALSE;

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -1156 +1156 @@
             !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo")) &&
             !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz")) &&
+            !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzma")) &&
             !does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
             log_msg(3, "Cannot find a data slice or terminator slice on CD %d", g_current_media_number);
@@ -1183 +1184 @@
                     mr_asprintf(suffix, "gz");
                 } else
+                    if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzma"))) {
+                    mr_asprintf(bzip2_command, "lzma");
+                    mr_asprintf(suffix, "lzma");
+                } else
                     if (does_file_exist(slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
                     mr_asprintf(bzip2_command, "bzip2");
@@ -1598 +1603 @@
         if (strstr(tarball_fname, ".bz2")) {
             mr_asprintf(executable, "bzip2");
+        } else if (strstr(tarball_fname, ".lzma")) {
+            mr_asprintf(executable, "lzma");
         } else if (strstr(tarball_fname, ".gz")) {
             mr_asprintf(executable, "gzip");
@@ -2099 +2106 @@
         if (!does_file_exist(tarball_fname)) {
             mr_free(tarball_fname);
+            mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzma", current_tarball_number);
+        }
+        if (!does_file_exist(tarball_fname)) {
+            mr_free(tarball_fname);
             mr_asprintf(tarball_fname, MNT_CDROM "/archives/%ld.afio.lzo", current_tarball_number);
         }