Changeset 1043 in MondoRescue for trunk/mondo/src/common/libmondo-tools.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-tools.c (modified) (3 diffs)

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

@@ -431 +431 @@
         mr_allocstr(bkpinfo->zip_exe, "lzop");
         mr_allocstr(bkpinfo->zip_suffix, "lzo");
+    } else if (bkpinfo->use_gzip) {
+        strcpy(bkpinfo->zip_exe, "gzip");
+        strcpy(bkpinfo->zip_suffix, "gz");
+    } else if (bkpinfo->use_gzip) {
+        strcpy(bkpinfo->zip_exe, "gzip");
+        strcpy(bkpinfo->zip_suffix, "gz");
     } else if (bkpinfo->compression_level != 0) {
         mr_allocstr(bkpinfo->zip_exe, "bzip2");
@@ -753 +759 @@
     mr_free(bkpinfo->restore_path);
     bkpinfo->use_lzo = FALSE;
+    bkpinfo->use_gzip = FALSE;
+    bkpinfo->do_not_compress_these[0] = '\0';
     bkpinfo->verify_data = FALSE;
     bkpinfo->backup_data = FALSE;
@@ -909 +917 @@
     }
     retval += whine_if_not_found("bzip2");
+    retval += whine_if_not_found("gzip");
     retval += whine_if_not_found("awk");
     retval += whine_if_not_found("md5sum");