Changeset 1043 in MondoRescue for trunk/mondo/src/mondorestore/mondo-rstr-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/mondorestore/mondo-rstr-tools.c (modified) (1 diff)

trunk/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -952 +952 @@
         mr_allocstr(bkpinfo->zip_exe, "lzop");
         mr_allocstr(bkpinfo->zip_suffix, "lzo");
+        bkpinfo->use_gzip = FALSE;
     } else {
         mr_free(value);
-        read_cfg_var(cfg_file, "use-comp", value);
+        read_cfg_var(cfg_file, "use-gzip", value);
         if (strstr(value, "yes")) {
             bkpinfo->use_lzo = FALSE;
-            mr_allocstr(bkpinfo->zip_exe, "bzip2");
-            mr_allocstr(bkpinfo->zip_suffix, "bz2");
+            bkpinfo->use_gzip = TRUE;
+            mr_allocstr(bkpinfo->zip_exe, "gzip");
+            mr_allocstr(bkpinfo->zip_suffix, "gz");
         } else {
-            // Just to be sure
-            bkpinfo->zip_exe = NULL;
-            bkpinfo->zip_suffix = NULL;
+            read_cfg_var(cfg_file, "use-comp", value);
+            if (strstr(value, "yes")) {
+                bkpinfo->use_lzo = FALSE;
+                bkpinfo->use_gzip = FALSE;
+                mr_allocstr(bkpinfo->zip_exe, "bzip2");
+                mr_allocstr(bkpinfo->zip_suffix, "bz2");
+            } else {
+                // Just to be sure
+                bkpinfo->zip_exe = NULL;
+                bkpinfo->zip_suffix = NULL;
+            }
         }
     }