Changeset 1043 in MondoRescue for trunk/mondo/src/mondorestore

Timestamp:

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

Author:

Bruno Cornec

Message:

merge -r978:1042 $SVN_M/branches/stable

Location:

trunk/mondo/src/mondorestore

Files:

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

trunk/mondo/src/mondorestore/mondo-restore.c

@@ -1002 +1002 @@
     char *outfile_fname = NULL;
     char *tmp = NULL;
+    char *tmp0 = NULL;
     char *tmp1 = NULL;
     char *tmp2 = NULL;
@@ -1157 +1158 @@
     for (sliceno = 1, finished = FALSE; !finished;) {
         tmp = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "");
+        tmp0 = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "gz");
         tmp1 = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "lzo");
         tmp2 = slice_fname(bigfileno, sliceno, ARCHIVES_PATH, "bz2");
-        if (!does_file_exist(tmp) && !does_file_exist(tmp1) &&
+        if (!does_file_exist(tmp) && 
+            !does_file_exist(tmp0) &&
+            !does_file_exist(tmp1) &&
             !does_file_exist(tmp2)) {
             log_msg(3,
@@ -1190 +1194 @@
                 if (does_file_exist(tmp1)) {
                     mr_asprintf(&bzip2_command, "lzop -dc %s 2>> %s",tmp1, MONDO_LOGFILE);
+                } else if (does_file_exist(tmp0)) {
+                    mr_asprintf(&bzip2_command, "gzip -dc %s 2>> %s",tmp0, MONDO_LOGFILE);
                 } else if (does_file_exist(tmp2)) {
                         mr_asprintf(&bzip2_command, "bzip2 -dc %s 2>> %s",tmp2, MONDO_LOGFILE);
@@ -1616 +1622 @@
         if (strstr(tarball_fname, ".bz2")) {
             mr_asprintf(&executable, "bzip2");
+        } else if (strstr(tarball_fname, ".gz")) {
+            strcpy(executable, "gzip");
+        } else if (strstr(tarball_fname, ".gz")) {
+            strcpy(executable, "gzip");
         } else if (strstr(tarball_fname, ".lzo")) {
             mr_asprintf(&executable, "lzop");

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

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

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;
+            }
         }
     }