Changeset 998 in MondoRescue for branches/stable/mondo/src/mondorestore

Timestamp:

Dec 7, 2006, 2:01:34 AM (19 years ago)

Author:

Bruno Cornec

Message:

Attempt to solve #113

Location:

branches/stable/mondo/src/mondorestore

Files:

• mondo-restore.c (modified) (2 diffs)
• mondo-rstr-compare.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (1 diff)

branches/stable/mondo/src/mondorestore/mondo-restore.c

@@ -1572 +1572 @@
                     if (does_file_exist
                         (slice_fname
+                         (bigfileno, sliceno, ARCHIVES_PATH, "gz"))) {
+                    strcpy(bzip2_command, "gzip");
+                    strcpy(suffix, "gz");
+                } else
+                    if (does_file_exist
+                        (slice_fname
                          (bigfileno, sliceno, ARCHIVES_PATH, "bz2"))) {
                     strcpy(bzip2_command, "bzip2");
@@ -2037 +2043 @@
         if (strstr(tarball_fname, ".bz2")) {
             strcpy(executable, "bzip2");
+        } else if (strstr(tarball_fname, ".gz")) {
+            strcpy(executable, "gzip");
         } else if (strstr(tarball_fname, ".lzo")) {
             strcpy(executable, "lzop");

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

@@ -317 +317 @@
     if (strstr(tarball_fname, ".bz2")) {
         strcpy(compressor_exe, "bzip2");
+    } else if (strstr(tarball_fname, ".gz")) {
+        strcpy(compressor_exe, "gzip");
     } else if (strstr(tarball_fname, ".lzo")) {
         strcpy(compressor_exe, "lzop");

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

@@ -1136 +1136 @@
     if (strstr(value, "yes")) {
         bkpinfo->use_lzo = TRUE;
+        bkpinfo->use_gzip = FALSE;
         strcpy(bkpinfo->zip_exe, "lzop");
         strcpy(bkpinfo->zip_suffix, "lzo");
     } else {
-        read_cfg_var(cfg_file, "use-comp", value);
+        read_cfg_var(cfg_file, "use-gzip", value);
         if (strstr(value, "yes")) {
             bkpinfo->use_lzo = FALSE;
-            strcpy(bkpinfo->zip_exe, "bzip2");
-            strcpy(bkpinfo->zip_suffix, "bz2");
+            bkpinfo->use_gzip = TRUE;
+            strcpy(bkpinfo->zip_exe, "gzip");
+            strcpy(bkpinfo->zip_suffix, "gz");
         } else {
-            bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+            read_cfg_var(cfg_file, "use-comp", value);
+            if (strstr(value, "yes")) {
+                bkpinfo->use_lzo = FALSE;
+                bkpinfo->use_gzip = FALSE;
+                strcpy(bkpinfo->zip_exe, "bzip2");
+                strcpy(bkpinfo->zip_suffix, "bz2");
+            } else {
+                bkpinfo->zip_exe[0] = bkpinfo->zip_suffix[0] = '\0';
+            }
         }
     }