Changeset 1043 in MondoRescue for trunk/mondo/src/common/libmondo-verify.c

Timestamp:

Jan 8, 2007, 11:31:22 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r978:1042 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-verify.c (modified) (3 diffs)

trunk/mondo/src/common/libmondo-verify.c

@@ -238 +238 @@
         if (bkpinfo->use_lzo) {
             mr_asprintf(&sz_exe, "lzop");
+        else if (bkpinfo->use_gzip) {
+            strcpy(sz_exe, "gzip");
+        } else if (bkpinfo->use_gzip) {
+            strcpy(sz_exe, "gzip");
         } else {
             mr_asprintf(&sz_exe, "bzip2");
@@ -409 +413 @@
         mr_allocstr(bkpinfo->zip_suffix, "lzo");
         bkpinfo->use_lzo = TRUE;
+        bkpinfo->use_gzip = FALSE;
+    }
+    if (strstr(tarball_fname, ".gz")
+        && strcmp(bkpinfo->zip_suffix, "gz")) {
+        log_msg(2, "OK, I'm going to start using gzip.");
+        strcpy(bkpinfo->zip_exe, "gzip");
+        strcpy(bkpinfo->zip_suffix, "gz");
+        bkpinfo->use_lzo = FALSE;
+        bkpinfo->use_gzip = TRUE;
     }
     if (strstr(tarball_fname, ".bz2")
@@ -416 +429 @@
         mr_allocstr(bkpinfo->zip_suffix, "bz2");
         bkpinfo->use_lzo = FALSE;
+        bkpinfo->use_gzip = FALSE;
     }
     unlink(outlog);